From ce21d0804012da27cec72abe896352d7f0e7e1e5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 8 Aug 2012 15:56:58 -0700 Subject: Fix strlower_m() to return an error indication. --- source3/lib/util_str.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 446838a0b9..8962b23da0 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -463,10 +463,11 @@ _PUBLIC_ void strlower_m(char *s) Convert a string to lower case. **/ -void strlower_m(char *s) +bool strlower_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 @@ -479,18 +480,21 @@ void strlower_m(char *s) } if (!*s) - return; + return true; /* I assume that lowercased string takes the same number of bytes * as source string even in UTF-8 encoding. (VIV) */ len = strlen(s) + 1; errno_save = errno; errno = 0; - unix_strlower(s,len,s,len); + ret = unix_strlower(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; } static bool unix_strupper(const char *src, size_t srclen, char *dest, size_t destlen) -- cgit