diff options
| author | Jeremy Allison <jra@samba.org> | 2012-08-08 12:16:40 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-08-09 09:47:35 -0700 |
| commit | 9fcc6f27fb2cf8cf5c30b701cb6788fc8f70cf82 (patch) | |
| tree | 68998f6bfdf92939f26690901fc9b7fb34a1bf4a /source3/lib/util_str.c | |
| parent | af3e529c18dae94d10b617eb8377e2ab64d34982 (diff) | |
| download | samba-9fcc6f27fb2cf8cf5c30b701cb6788fc8f70cf82.tar.gz samba-9fcc6f27fb2cf8cf5c30b701cb6788fc8f70cf82.tar.bz2 samba-9fcc6f27fb2cf8cf5c30b701cb6788fc8f70cf82.zip | |
Change strupper_m() to return a value.
Diffstat (limited to 'source3/lib/util_str.c')
| -rw-r--r-- | source3/lib/util_str.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index f6d9f3425f..f97cd3cc25 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -547,10 +547,11 @@ _PUBLIC_ void strupper_m(char *s) Convert a string to upper case. **/ -void strupper_m(char *s) +bool strupper_m(char *s) { size_t len; int errno_save; + bool ret = false; /* this is quite a common operation, so we want it to be fast. We optimise for the ascii case, knowing that all our @@ -563,18 +564,21 @@ void strupper_m(char *s) } if (!*s) - return; + return true; /* I assume that lowercased string takes the same number of bytes * as source string even in multibyte encoding. (VIV) */ len = strlen(s) + 1; errno_save = errno; errno = 0; - unix_strupper(s,len,s,len); + ret = unix_strupper(s,len,s,len); /* Catch mb conversion errors that may not terminate. */ - if (errno) + if (errno) { s[len-1] = '\0'; + ret = false; + } errno = errno_save; + return ret; } /** |