From 2eea91957c90d6a5960b5350d2c4664812260a7b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 8 Apr 2011 12:02:40 +1000 Subject: lib/util Move simple string routines into common code. Signed-off-by: Andrew Tridgell --- source3/lib/util_str.c | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'source3/lib') diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 0f75f45bf1..a710fcc35b 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -208,36 +208,6 @@ bool strnequal(const char *s1,const char *s2,size_t n) return(StrnCaseCmp(s1,s2,n)==0); } -/** -Do a case-insensitive, whitespace-ignoring string compare. -**/ - -int strwicmp(const char *psz1, const char *psz2) -{ - /* if BOTH strings are NULL, return TRUE, if ONE is NULL return */ - /* appropriate value. */ - if (psz1 == psz2) - return (0); - else if (psz1 == NULL) - return (-1); - else if (psz2 == NULL) - return (1); - - /* sync the strings on first non-whitespace */ - while (1) { - while (isspace((int)*psz1)) - psz1++; - while (isspace((int)*psz2)) - psz2++; - if (toupper_ascii(*psz1) != toupper_ascii(*psz2) || - *psz1 == '\0' || *psz2 == '\0') - break; - psz1++; - psz2++; - } - return (*psz1 - *psz2); -} - /** Convert a string to "normal" form. **/ @@ -1635,25 +1605,6 @@ void string_append(char **left, const char *right) safe_strcat(*left, right, new_len-1); } -bool add_string_to_array(TALLOC_CTX *mem_ctx, - const char *str, const char ***strings, - int *num) -{ - char *dup_str = talloc_strdup(mem_ctx, str); - - *strings = TALLOC_REALLOC_ARRAY(mem_ctx, *strings, - const char *, (*num)+1); - - if ((*strings == NULL) || (dup_str == NULL)) { - *num = 0; - return false; - } - - (*strings)[*num] = dup_str; - *num += 1; - return true; -} - /* Append an sprintf'ed string. Double buffer size on demand. Usable without * error checking in between. The indiation that something weird happened is * string==NULL */ -- cgit