summaryrefslogtreecommitdiff
path: root/source4/lib/iconv.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-14 22:23:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:48 -0500
commit31ded4901b4529ad2e49871502cab5ecba71483a (patch)
tree9ee5bf3ede7f672060e843c3c09cf5e9ad5f0fb4 /source4/lib/iconv.c
parente856a8d83c18820a270ef865d2d7869849ce4e20 (diff)
downloadsamba-31ded4901b4529ad2e49871502cab5ecba71483a.tar.gz
samba-31ded4901b4529ad2e49871502cab5ecba71483a.tar.bz2
samba-31ded4901b4529ad2e49871502cab5ecba71483a.zip
r3737: - Get rid of the register_subsystem() and register_backend() functions.
- Re-disable tdbtool (it was building fine on my Debian box but other machines were having problems) (This used to be commit 0d7bb2c40b7a9ed59df3f8944133ea562697e814)
Diffstat (limited to 'source4/lib/iconv.c')
-rw-r--r--source4/lib/iconv.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/source4/lib/iconv.c b/source4/lib/iconv.c
index 085ec0ec2f..045ed36320 100644
--- a/source4/lib/iconv.c
+++ b/source4/lib/iconv.c
@@ -73,7 +73,7 @@ static const struct charset_functions builtin_functions[] = {
static struct charset_functions *charsets = NULL;
-static NTSTATUS charset_register_backend(const void *_funcs)
+NTSTATUS charset_register_backend(const void *_funcs)
{
struct charset_functions *funcs = memdup(_funcs,sizeof(struct charset_functions));
struct charset_functions *c = charsets;
@@ -92,22 +92,6 @@ static NTSTATUS charset_register_backend(const void *_funcs)
return NT_STATUS_OK;
}
-static void lazy_initialize_iconv(void)
-{
- static BOOL initialized = False;
- int i;
-
- if (!initialized) {
- initialized = True;
- register_subsystem("charset", charset_register_backend);
-
- charset_init_static_modules;
-
- for(i = 0; builtin_functions[i].name; i++)
- register_backend("charset", &builtin_functions[i]);
- }
-}
-
#ifdef HAVE_NATIVE_ICONV
/* if there was an error then reset the internal state,
this ensures that we don't have a shift state remaining for
@@ -179,7 +163,6 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
smb_iconv_t ret;
struct charset_functions *from, *to;
- lazy_initialize_iconv();
from = charsets;
to = charsets;