summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-14 12:31:18 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-14 12:31:18 +1000
commit9d62ee2a815570b24a099b3960ed23942eebb3e7 (patch)
tree7b1b0d49601f5749353da6f11572446ba03ae1bc /source3
parent35fca856604f32c1a30b018dcd05e7f43fafae5d (diff)
downloadsamba-9d62ee2a815570b24a099b3960ed23942eebb3e7.tar.gz
samba-9d62ee2a815570b24a099b3960ed23942eebb3e7.tar.bz2
samba-9d62ee2a815570b24a099b3960ed23942eebb3e7.zip
s3-lib Move strisnormal to it's only user in mangle_hash.c
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/lib/util_str.c13
-rw-r--r--source3/smbd/mangle_hash.c13
3 files changed, 13 insertions, 14 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index be2915f4c5..e87a09a0c9 100644
--- 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 13aa78cc91..fdb06425e2 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -221,19 +221,6 @@ void strnorm(char *s, int case_default)
}
/**
- 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 ebfacd1c33..d98b350a37 100644
--- 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.
*****************************************************************************/