lib/util: Use common d_printf() in the whole codebase

This removes the lang_tdb based varient, the only user of the lang_tdb
code is SWAT, which calls that directly.

'net' and 'pam_winbind' are internationalised using gettext.

Andrew Bartlett

3 files changed, 1 insertions, 130 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5b36fe2533..7a471dde4e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -455,7 +455,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
 	  lib/username.o \
 	  ../libds/common/flag_mapping.o \
 	  lib/access.o lib/smbrun.o \
-	  lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
+	  lib/bitmap.o ../lib/util/dprintf.o $(UTIL_REG_OBJ) \
 	  lib/wins_srv.o lib/string_init.o \
 	  lib/util_str.o ../lib/util/util_str_common.o \
 	  ../lib/util/util_str.o \
diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
deleted file mode 100644
index 55ea7f9888..0000000000
--- a/source3/lib/dprintf.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   display print functions
-   Copyright (C) Andrew Tridgell 2001
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/*
-  this module provides functions for printing internal strings in the "display charset"
-  This charset may be quite different from the chosen unix charset
-
-  Eventually these functions will need to take care of column count constraints
-
-  The d_ prefix on print functions in Samba refers to the display character set
-  conversion
-*/
-
-#include "includes.h"
-#include "intl/lang_tdb.h"
-
-static int d_vfprintf(FILE *f, const char *format, va_list ap)
-{
-	char *p = NULL, *p2 = NULL;
-	int ret, maxlen, clen;
-	size_t size = 0;
-	const char *msgstr;
-	va_list ap2;
-
-	va_copy(ap2, ap);
-
-	/* do any message translations */
-	msgstr = lang_msg(format);
-	if (!msgstr) {
-		ret = -1;
-		goto out;
-	}
-
-	ret = vasprintf(&p, msgstr, ap2);
-
-	lang_msg_free(msgstr);
-
-	if (ret <= 0) {
-		ret = -1;
-		goto out;
-	}
-
-	/* now we have the string in unix format, convert it to the display
-	   charset, but beware of it growing */
-	maxlen = ret*2;
-again:
-	p2 = (char *)SMB_MALLOC(maxlen);
-	if (!p2) {
-		ret = -1;
-		goto out;
-	}
-
-	if (!convert_string(CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen, &size)) {
-		ret = -1;
-		goto out;
-	}
-	clen = size;
-
-	if (clen >= maxlen) {
-		/* it didn't fit - try a larger buffer */
-		maxlen *= 2;
-		SAFE_FREE(p2);
-		goto again;
-	}
-
-	/* good, its converted OK */
-	ret = fwrite(p2, 1, clen, f);
-out:
-
-	SAFE_FREE(p);
-	SAFE_FREE(p2);
-	va_end(ap2);
-
-	return ret;
-}
-
-
- int d_fprintf(FILE *f, const char *format, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, format);
-	ret = d_vfprintf(f, format, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-static FILE *outfile;
-
- int d_printf(const char *format, ...)
-{
-	int ret;
-	va_list ap;
-
-	if (!outfile) outfile = stdout;
-	
-	va_start(ap, format);
-	ret = d_vfprintf(outfile, format, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-/* interactive programs need a way of tell d_*() to write to stderr instead
-   of stdout */
-void display_set_stderr(void)
-{
-	outfile = stderr;
-}
diff --git a/source3/wscript_build b/source3/wscript_build
index 0e76d1f7af..2f430a9047 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -69,7 +69,6 @@ LIB_SRC = '''
           lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
           lib/username.c
           lib/access.c lib/smbrun.c
-          lib/dprintf.c
           lib/wins_srv.c
           lib/util_sid.c
           lib/util_file.c