From 2ae400b213a673253da0e3088ce1c3f54d9681cc Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 16 Dec 2007 00:17:41 +0100 Subject: Make init_doschar_table() static It's only called directly before init_valid_table() anyway, so move it there. (This used to be commit b6d1d2428866712a550a354732e2386b4f87b67b) --- source3/lib/charcnv.c | 1 - source3/lib/util_unistr.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 2515e6cef3..8a00b235cc 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -178,7 +178,6 @@ void init_iconv(void) * codepage changes? */ /* XXX: Is the did_reload test too strict? */ conv_silent = True; - init_doschar_table(); init_valid_table(); conv_silent = False; } diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index 5bb8cbae96..510f40e611 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -190,7 +190,7 @@ static int check_dos_char_slowly(smb_ucs2_t c) * Fill out doschar table the hard way, by examining each character **/ -void init_doschar_table(void) +static void init_doschar_table(void) { int i, j, byteval; @@ -228,6 +228,8 @@ void init_valid_table(void) const char *allowed = ".!#$%&'()_-@^`~"; uint8 *valid_file; + init_doschar_table(); + if (mapped_file) { /* Can't unmap files, so stick with what we have */ return; -- cgit