From 7b7619e0ba489329ced5f5159f97ba7da5aa3fa5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 9 Oct 2004 07:11:21 +0000 Subject: r2871: - got rid of the last bits of non-threadsafe data in util_str.o - switch the fallback case tables to use talloc - moved the used-once octal_string() inline in loadparm.c (This used to be commit b04202eaacc87d264d463f75673ee0e68cd54f94) --- source4/lib/util_unistr.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'source4/lib/util_unistr.c') diff --git a/source4/lib/util_unistr.c b/source4/lib/util_unistr.c index 8b7504986f..480fb6c72e 100644 --- a/source4/lib/util_unistr.c +++ b/source4/lib/util_unistr.c @@ -32,13 +32,9 @@ load the case handling tables ********************************************************************/ static void load_case_tables(void) { - static int initialised; int i; TALLOC_CTX *mem_ctx; - if (initialised) return; - initialised = 1; - mem_ctx = talloc_init("load_case_tables"); if (!mem_ctx) { smb_panic("No memory for case_tables"); @@ -49,9 +45,9 @@ static void load_case_tables(void) /* we would like Samba to limp along even if these tables are not available */ - if (!upcase_table) { + if (upcase_table == NULL) { DEBUG(1,("creating lame upcase table\n")); - upcase_table = malloc(0x20000); + upcase_table = talloc_named_const(NULL, 0x20000, "upcase_table"); if (!upcase_table) { smb_panic("No memory for upcase tables"); } @@ -63,9 +59,9 @@ static void load_case_tables(void) } } - if (!lowcase_table) { + if (lowcase_table == NULL) { DEBUG(1,("creating lame lowcase table\n")); - lowcase_table = malloc(0x20000); + lowcase_table = talloc_named_const(NULL, 0x20000, "lowcase_table"); if (!lowcase_table) { smb_panic("No memory for lowcase tables"); } -- cgit