summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-21 12:51:30 +1000
committerAndrew Tridgell <tridge@samba.org>2011-06-21 15:54:38 +1000
commitbf83b641e265a7b1523545294c268c6708999d2a (patch)
treec66cd6a9a58dd858ac9dc9b8be8ba37b05a6ffe1 /lib/util
parentc017cbfaa47f6cb7da38a7021427412fe2e62a8d (diff)
downloadsamba-bf83b641e265a7b1523545294c268c6708999d2a.tar.gz
samba-bf83b641e265a7b1523545294c268c6708999d2a.tar.bz2
samba-bf83b641e265a7b1523545294c268c6708999d2a.zip
lib/util Remove display_cd from d_printf()
The setting of the display charset is now done by convert_string_talloc() selecting the right charset based on CH_DISPLAY. Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/dprintf.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c
index c79989b517..a77eed84f5 100644
--- a/lib/util/dprintf.c
+++ b/lib/util/dprintf.c
@@ -34,8 +34,6 @@
#include "includes.h"
#include "system/locale.h"
-static smb_iconv_t display_cd = (smb_iconv_t)-1;
-
static int d_vfprintf(FILE *f, const char *format, va_list ap)
{
char *p, *p2;
@@ -44,11 +42,6 @@ static int d_vfprintf(FILE *f, const char *format, va_list ap)
bool cret;
va_list ap2;
- /* If there's nothing to convert, take a shortcut */
- if (display_cd == (smb_iconv_t)-1) {
- return vfprintf(f, format, ap);
- }
-
va_copy(ap2, ap);
ret = vasprintf(&p, format, ap2);
va_end(ap2);