diff options
author | Volker Lendecke <vlendec@samba.org> | 2007-06-29 17:27:59 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:43 -0500 |
commit | 971b640e0cb8bac510771d126454a8e4d2eff507 (patch) | |
tree | 3c1de04971bc3ae38305f5b406c9a9d65d81f99e /source3/lib | |
parent | 8689b1ce99d7941c6548e75e8e8b8a2751de4c2c (diff) | |
download | samba-971b640e0cb8bac510771d126454a8e4d2eff507.tar.gz samba-971b640e0cb8bac510771d126454a8e4d2eff507.tar.bz2 samba-971b640e0cb8bac510771d126454a8e4d2eff507.zip |
r23660: Anybody know what check_dos_char() was used for? It wasn't called at
all, so it's gone. With it 8k bss went away.
(This used to be commit 7e9a4c39a5ce620f8eac74d0ae4dd80b96c81aca)
Diffstat (limited to 'source3/lib')
-rw-r--r-- | source3/lib/charcnv.c | 1 | ||||
-rw-r--r-- | source3/lib/util_unistr.c | 52 |
2 files changed, 1 insertions, 52 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c index 35343b2f0a..7be073fafc 100644 --- a/source3/lib/charcnv.c +++ b/source3/lib/charcnv.c @@ -179,7 +179,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 cf040a2dfc..0221d19dc1 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -36,14 +36,6 @@ static BOOL lowcase_table_use_unmap; static BOOL valid_table_use_unmap; /** - * This table says which Unicode characters are valid dos - * characters. - * - * Each value is just a single bit. - **/ -static uint8 doschar_table[8192]; /* 65536 characters / 8 bits/byte */ - -/** * Destroy global objects allocated by load_case_tables() **/ void gfree_case_tables(void) @@ -150,21 +142,6 @@ void load_case_tables(void) #endif } -/* - see if a ucs2 character can be mapped correctly to a dos character - and mapped back to the same character in ucs2 -*/ - -int check_dos_char(smb_ucs2_t c) -{ - lazy_initialize_conv(); - - /* Find the right byte, and right bit within the byte; return - * 1 or 0 */ - return (doschar_table[(c & 0xffff) / 8] & (1 << (c & 7))) != 0; -} - - static int check_dos_char_slowly(smb_ucs2_t c) { char buf[10]; @@ -182,33 +159,6 @@ static int check_dos_char_slowly(smb_ucs2_t c) return (c == c2); } - -/** - * Fill out doschar table the hard way, by examining each character - **/ - -void init_doschar_table(void) -{ - int i, j, byteval; - - /* For each byte of packed table */ - - for (i = 0; i <= 0xffff; i += 8) { - byteval = 0; - for (j = 0; j <= 7; j++) { - smb_ucs2_t c; - - c = i + j; - - if (check_dos_char_slowly(c)) { - byteval |= 1 << j; - } - } - doschar_table[i/8] = byteval; - } -} - - /** * Load the valid character map table from <tt>valid.dat</tt> or * create from the configured codepage. @@ -257,7 +207,7 @@ void init_valid_table(void) for (;i<0x10000;i++) { smb_ucs2_t c; SSVAL(&c, 0, i); - valid_table[i] = check_dos_char(c); + valid_table[i] = check_dos_char_slowly(c); } } |