diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-27 18:10:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:54 -0500 |
| commit | 61ffa08f4c95e29d301de9fbabd6e71c2dbc1056 (patch) | |
| tree | 5639bb3b7628532080737e4e1b1ff0b835ee4977 /source4/lib/charset | |
| parent | 4fb038b0b8e7a4bb69ac0d9022684eeaca8a491a (diff) | |
| download | samba-61ffa08f4c95e29d301de9fbabd6e71c2dbc1056.tar.gz samba-61ffa08f4c95e29d301de9fbabd6e71c2dbc1056.tar.bz2 samba-61ffa08f4c95e29d301de9fbabd6e71c2dbc1056.zip | |
r24712: No longer expose the 'BOOL' data type in any interfaces.
(This used to be commit 1ce32673d960c8b05b6c1b1b99e1976a402417ae)
Diffstat (limited to 'source4/lib/charset')
| -rw-r--r-- | source4/lib/charset/iconv.c | 2 | ||||
| -rw-r--r-- | source4/lib/charset/util_unistr.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c index dacb65ccad..d10b3bb03c 100644 --- a/source4/lib/charset/iconv.c +++ b/source4/lib/charset/iconv.c @@ -148,7 +148,7 @@ size_t smb_iconv(smb_iconv_t cd, return 0; } -static BOOL is_utf16(const char *name) +static bool is_utf16(const char *name) { return strcasecmp(name, "UCS-2LE") == 0 || strcasecmp(name, "UTF-16LE") == 0; diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c index feac7a65e9..3fa3bf75a9 100644 --- a/source4/lib/charset/util_unistr.c +++ b/source4/lib/charset/util_unistr.c @@ -160,10 +160,10 @@ _PUBLIC_ int strcasecmp_m(const char *s1, const char *s2) * Based on a routine by GJC@VILLAGE.COM. * Extensively modified by Andrew.Tridgell@anu.edu.au **/ -_PUBLIC_ BOOL next_token(const char **ptr,char *buff, const char *sep, size_t bufsize) +_PUBLIC_ bool next_token(const char **ptr,char *buff, const char *sep, size_t bufsize) { const char *s; - BOOL quoted; + bool quoted; size_t len=1; if (!ptr) @@ -248,7 +248,7 @@ _PUBLIC_ int strncasecmp_m(const char *s1, const char *s2, size_t n) * * @note The comparison is case-insensitive. **/ -_PUBLIC_ BOOL strequal_w(const char *s1, const char *s2) +_PUBLIC_ bool strequal_w(const char *s1, const char *s2) { return strcasecmp_m(s1,s2) == 0; } @@ -256,7 +256,7 @@ _PUBLIC_ BOOL strequal_w(const char *s1, const char *s2) /** Compare 2 strings (case sensitive). **/ -_PUBLIC_ BOOL strcsequal_w(const char *s1,const char *s2) +_PUBLIC_ bool strcsequal_w(const char *s1,const char *s2) { if (s1 == s2) return(True); @@ -429,7 +429,7 @@ _PUBLIC_ char *strrchr_m(const char *s, char c) /** return True if any (multi-byte) character is lower case */ -_PUBLIC_ BOOL strhaslower(const char *string) +_PUBLIC_ bool strhaslower(const char *string) { while (*string) { size_t c_size; @@ -452,7 +452,7 @@ _PUBLIC_ BOOL strhaslower(const char *string) /** return True if any (multi-byte) character is upper case */ -_PUBLIC_ BOOL strhasupper(const char *string) +_PUBLIC_ bool strhasupper(const char *string) { while (*string) { size_t c_size; |