s3-lib Move strisnormal to it's only user in mangle_hash.c

diff --git a/source3/include/proto.h b/source3/include/proto.h
index be2915f4c57e88e1b0e4e7dd07f12a1fe27a09cf..e87a09a0c9b6fa2bc0c21d27b5b1cfe0f1fd3f2a 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -958,7 +958,6 @@ int StrnCaseCmp(const char *s, const char *t, size_t len);
 bool strnequal(const char *s1,const char *s2,size_t n);
 bool strcsequal(const char *s1,const char *s2);
 void strnorm(char *s, int case_default);
-bool strisnormal(const char *s, int case_default);
 char *push_skip_string(char *buf);
 char *skip_string(const char *base, size_t len, char *buf);
 size_t str_charnum(const char *s);

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 13aa78cc913036307b03862cd3693fe03fcd0a7a..fdb06425e2e51639128a519f8b7ec198d542e952 100644 (file)
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -220,19 +220,6 @@ void strnorm(char *s, int case_default)
                strlower_m(s);
 }
 
-/**
- Check if a string is in "normal" case.
-**/
-
-bool strisnormal(const char *s, int case_default)
-{
-       if (case_default == CASE_UPPER)
-               return(!strhaslower(s));
-
-       return(!strhasupper(s));
-}
-
-
 /**
  *  Skip past some strings in a buffer - old version - no checks.
  *  **/

diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index ebfacd1c335ab1b3debd8487453e2e031bdc49d7..d98b350a37ef6d67fad0f79daa72c35785490fd0 100644 (file)
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -587,6 +587,19 @@ static bool lookup_name_from_8_3(TALLOC_CTX *ctx,
        return *out ? True : False;
 }
 
+/**
+ Check if a string is in "normal" case.
+**/
+
+static bool strisnormal(const char *s, int case_default)
+{
+       if (case_default == CASE_UPPER)
+               return(!strhaslower(s));
+
+       return(!strhasupper(s));
+}
+
+
 /*****************************************************************************
  Do the actual mangling to 8.3 format.
 *****************************************************************************/