diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 10:24:58 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 18:41:00 +1100 |
| commit | 8afc271e2a9950fda68e99928746623093cbd6ac (patch) | |
| tree | e2a685a3929cea74a5d1b7f09ca6508e2b60fa30 /lib/util/charset/charset.h | |
| parent | bed374215ff040cc995659d42938be35412a794a (diff) | |
| download | samba-8afc271e2a9950fda68e99928746623093cbd6ac.tar.gz samba-8afc271e2a9950fda68e99928746623093cbd6ac.tar.bz2 samba-8afc271e2a9950fda68e99928746623093cbd6ac.zip | |
lib/util/charset Use top level iconv.c in source3
The two files were very similar already, the only change required was
to adopt the s3 module registration fucntion name.
(NTSTATUS wasn't used as the charset code does not otherwise use that
type).
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'lib/util/charset/charset.h')
| -rw-r--r-- | lib/util/charset/charset.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index 901885d846..28d762578b 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -218,7 +218,7 @@ smb_iconv_t smb_iconv_open_ex(TALLOC_CTX *mem_ctx, const char *tocode, const char *fromcode, bool native_iconv); void load_case_tables(void); -bool charset_register_backend(const void *_funcs); +bool smb_register_charset(const struct charset_functions *funcs_in); /* * Define stub for charset module which implements 8-bit encoding with gaps. @@ -293,8 +293,11 @@ struct charset_functions CHARSETNAME ## _functions = \ NTSTATUS charset_ ## CHARSETNAME ## _init(void); \ NTSTATUS charset_ ## CHARSETNAME ## _init(void) \ { \ - return smb_register_charset(& CHARSETNAME ## _functions); \ -} \ + if (!smb_register_charset(& CHARSETNAME ## _functions)) { \ + return NT_STATUS_INTERNAL_ERROR; \ + } \ + return NT_STATUS_OK; \ +} \ #endif /* __CHARSET_H__ */ |