summaryrefslogtreecommitdiff
path: root/source4/lib/charset
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-08-27 18:43:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:02:55 -0500
commited8d04ead92839d54ca67f55a8e2be9723dc6b0d (patch)
tree414bb012528924e48b37c26bbf7c80c99f0741e3 /source4/lib/charset
parentf93a18eeb7d1f748a7b026d7eae064bfefa5c5f5 (diff)
downloadsamba-ed8d04ead92839d54ca67f55a8e2be9723dc6b0d.tar.gz
samba-ed8d04ead92839d54ca67f55a8e2be9723dc6b0d.tar.bz2
samba-ed8d04ead92839d54ca67f55a8e2be9723dc6b0d.zip
r24717: Some more easy bool conversions, update TODO for registry
(This used to be commit fc8771fb6aab815e63334da0159032f7ecd0a931)
Diffstat (limited to 'source4/lib/charset')
-rw-r--r--source4/lib/charset/iconv.c2
-rw-r--r--source4/lib/charset/util_unistr.c22
2 files changed, 12 insertions, 12 deletions
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c
index d10b3bb03c..4eda585d4e 100644
--- a/source4/lib/charset/iconv.c
+++ b/source4/lib/charset/iconv.c
@@ -199,7 +199,7 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
}
#ifdef HAVE_NATIVE_ICONV
- if ((!from || !to) && !lp_parm_bool(-1, "iconv", "native", True)) {
+ if ((!from || !to) && !lp_parm_bool(-1, "iconv", "native", true)) {
goto failed;
}
if (!from) {
diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c
index 3fa3bf75a9..6c86b0b899 100644
--- a/source4/lib/charset/util_unistr.c
+++ b/source4/lib/charset/util_unistr.c
@@ -167,7 +167,7 @@ _PUBLIC_ bool next_token(const char **ptr,char *buff, const char *sep, size_t bu
size_t len=1;
if (!ptr)
- return(False);
+ return false;
s = *ptr;
@@ -180,11 +180,11 @@ _PUBLIC_ bool next_token(const char **ptr,char *buff, const char *sep, size_t bu
s++;
/* nothing left? */
- if (! *s)
- return(False);
+ if (!*s)
+ return false;
/* copy over the token */
- for (quoted = False; len < bufsize && *s && (quoted || !strchr_m(sep,*s)); s++) {
+ for (quoted = false; len < bufsize && *s && (quoted || !strchr_m(sep,*s)); s++) {
if (*s == '\"') {
quoted = !quoted;
} else {
@@ -196,7 +196,7 @@ _PUBLIC_ bool next_token(const char **ptr,char *buff, const char *sep, size_t bu
*ptr = (*s) ? s+1 : s;
*buff = 0;
- return(True);
+ return true;
}
/**
@@ -259,9 +259,9 @@ _PUBLIC_ bool strequal_w(const char *s1, const char *s2)
_PUBLIC_ bool strcsequal_w(const char *s1,const char *s2)
{
if (s1 == s2)
- return(True);
+ return true;
if (!s1 || !s2)
- return(False);
+ return false;
return strcmp(s1,s2) == 0;
}
@@ -442,11 +442,11 @@ _PUBLIC_ bool strhaslower(const char *string)
t = toupper_w(s);
if (s != t) {
- return True; /* that means it has lower case chars */
+ return true; /* that means it has lower case chars */
}
}
- return False;
+ return false;
}
/**
@@ -465,11 +465,11 @@ _PUBLIC_ bool strhasupper(const char *string)
t = tolower_w(s);
if (s != t) {
- return True; /* that means it has upper case chars */
+ return true; /* that means it has upper case chars */
}
}
- return False;
+ return false;
}
/**