sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-13 16:23:50 +03:00
Code Activity

r26429: Avoid use of global_smb_iconv_convenience.

Browse Source
This commit is contained in:
Jelmer Vernooij
2007-12-13 22:46:09 +01:00
committed by Stefan Metzmacher
parent 5a3a851dc7
commit d37136b7ab
39 changed files with 176 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/lib/util/dprintf.c
View File

@@ -32,6 +32,7 @@
#include "includes.h"
#include "system/locale.h"
#include "param/param.h"
_PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap) _PRINTF_ATTRIBUTE(2,0)
{
@@ -55,7 +56,7 @@ again:
SAFE_FREE(p);
return -1;
}
clen = convert_string(global_smb_iconv_convenience, CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen);
clen = convert_string(lp_iconv_convenience(global_loadparm), CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen);
if (clen == -1) {
/* the string can't be converted - do the best we can,
filling in non-printing chars with '?' */