mirror of
https://github.com/samba-team/samba.git
synced 2025-11-15 16:23:49 +03:00
r26429: Avoid use of global_smb_iconv_convenience.
This commit is contained in:
committed by
Stefan Metzmacher
parent
5a3a851dc7
commit
d37136b7ab
@@ -587,6 +587,7 @@ char *yytext;
|
||||
#line 23 "lex.l"
|
||||
#include "includes.h"
|
||||
#include "lib/policy/parse_adm.h"
|
||||
#include "param/param.h"
|
||||
void error_message (const char *format, ...);
|
||||
int yyparse (void);
|
||||
|
||||
@@ -600,7 +601,7 @@ static bool utf16 = false;
|
||||
if (fread(&v, 2, 1, yyin) < 1) \
|
||||
result = YY_NULL; \
|
||||
else \
|
||||
result = push_codepoint(global_smb_iconv_convenience, buf, v); \
|
||||
result = push_codepoint(lp_iconv_convenience(global_loadparm), buf, v); \
|
||||
} else { \
|
||||
int c = getc(yyin); \
|
||||
result = (c == EOF) ? YY_NULL : (buf[0] = c, 1); \
|
||||
|
||||
Reference in New Issue
Block a user