summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-16 00:17:41 +0100
committerJeremy Allison <jra@samba.org>2007-12-16 10:56:58 -0800
commit2ae400b213a673253da0e3088ce1c3f54d9681cc (patch)
tree1dc8c4c802f17d772c3e549f7aca1abd1d229596 /source3
parentc335e3322d1690331366972cf55dde9f4305981c (diff)
downloadsamba-2ae400b213a673253da0e3088ce1c3f54d9681cc.tar.gz
samba-2ae400b213a673253da0e3088ce1c3f54d9681cc.tar.bz2
samba-2ae400b213a673253da0e3088ce1c3f54d9681cc.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/charcnv.c1
-rw-r--r--source3/lib/util_unistr.c4
2 files changed, 3 insertions, 2 deletions
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;