sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-07 00:58:40 +03:00
Code

s3:registry Renaming get_charset() to smbreg_get_charset()

Browse Source 
Rename to smbreg_get_charset() function to avoid naming conflict
with MariaDB.

Signed-off-by: xzhao9 <i@xuzhao.net>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@suse.com>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Feb 10 21:00:28 UTC 2021 on sn-devel-184
This commit is contained in:
xzhao9 2021-01-03 13:02:18 -05:00 committed by Jeremy Allison
parent df75d82c9d
commit 551532d007
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/registry/reg_format.c
View File

@ -791,7 +791,7 @@ struct reg_format* reg_format_file(const void* talloc_ctx,
opt.enc));
goto fail;
}
fmt_ctx->encoding = talloc_strdup(fmt_ctx, get_charset(opt.enc));
fmt_ctx->encoding = talloc_strdup(fmt_ctx, smbreg_get_charset(opt.enc));
fmt_ctx->file = fopen(filename, "w");
if (fmt_ctx->file == NULL) {

6
source3/registry/reg_parse_internal.c
View File

@ -215,7 +215,7 @@ const struct hive_info* hive_info(const char* name)
return info;
}
const char* get_charset(const char* c)
const char *smbreg_get_charset(const char *c)
{
if (strcmp(c, "dos") == 0) {
return lp_dos_charset();
@ -231,8 +231,8 @@ bool set_iconv(smb_iconv_t* t, const char* to, const char* from)
smb_iconv_t cd = (smb_iconv_t)-1;
if (to && from) {
to = get_charset(to);
from = get_charset(from);
to = smbreg_get_charset(to);
from = smbreg_get_charset(from);
cd = smb_iconv_open(to, from);
if (cd == ((smb_iconv_t)-1)) {
return false;

2
source3/registry/reg_parse_internal.h
View File

@ -73,7 +73,7 @@ bool srprs_hive(const char** ptr, const struct hive_info** result);
const char* get_charset(const char* c);
const char *smbreg_get_charset(const char *c);
bool set_iconv(smb_iconv_t* t, const char* to, const char* from);