diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-11 10:20:24 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-11 10:20:24 -0800 |
| commit | 4f2635b729e636e123afacb0970c3d49343b3e90 (patch) | |
| tree | 76d632982f23f08b23593af78614e9414dbbac2c /lib/util/dprintf.c | |
| parent | 8cb23a6b2950d7419767845b6097470f76f348a7 (diff) | |
| parent | 2e6bf03e519e180a1ee672dc9c9171d9e0cd114f (diff) | |
| download | samba-4f2635b729e636e123afacb0970c3d49343b3e90.tar.gz samba-4f2635b729e636e123afacb0970c3d49343b3e90.tar.bz2 samba-4f2635b729e636e123afacb0970c3d49343b3e90.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'lib/util/dprintf.c')
| -rw-r--r-- | lib/util/dprintf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c index e4f02758eb..3e6d0e8bca 100644 --- a/lib/util/dprintf.c +++ b/lib/util/dprintf.c @@ -60,7 +60,7 @@ _PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap) if (ret <= 0) return ret; - clen = convert_string_talloc_descriptor(NULL, display_cd, p, ret, (void **)&p2); + clen = iconv_talloc(NULL, display_cd, p, ret, (void **)&p2); if (clen == -1) { /* the string can't be converted - do the best we can, filling in non-printing chars with '?' */ |