diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-12 02:15:42 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:42 +0100 |
commit | b8850f326befab8a745e2b880214159908e7ec58 (patch) | |
tree | 97d181930ff9cc55abe819919dc8ee2450b40dc2 | |
parent | 4b0199a5493ea2b88558cc40871e63c1dc8dbb56 (diff) | |
download | samba-b8850f326befab8a745e2b880214159908e7ec58.tar.gz samba-b8850f326befab8a745e2b880214159908e7ec58.tar.bz2 samba-b8850f326befab8a745e2b880214159908e7ec58.zip |
r26410: Remove unnecessary static.
(This used to be commit 13ae3108dad2f9f0f7a421d672751fa594f4e3fb)
-rw-r--r-- | source4/lib/charset/charcnv.c | 6 | ||||
-rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c index 83bd11563f..5100a1b016 100644 --- a/source4/lib/charset/charcnv.c +++ b/source4/lib/charset/charcnv.c @@ -115,10 +115,10 @@ static smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic, charset_t from, charset_t to) { const char *n1, *n2; - static int initialised; + static bool initialised; - if (initialised == 0) { - initialised = 1; + if (initialised == false) { + initialised = true; #ifdef LC_ALL /* we set back the locale to C to get ASCII-compatible diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 508389e374..877c28e8fd 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/lib/ldb/common/ldb_modules.c @@ -168,7 +168,7 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name) int ldb_global_init(void) { - static int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES; + int (*static_init_fns[])(void) = STATIC_LIBLDB_MODULES; static int initialized = 0; int ret = 0, i; |