s3-lib make static and remove more _w functions

Signed-off-by: Andrew Tridgell <tridge@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4b7fda106cda3dbbb9036a56f07210892c2d631c..2ffff4c137e4b66e32fd41786fdf0cae18b9e361 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1063,9 +1063,7 @@ smb_ucs2_t *strnrchr_w(const smb_ucs2_t *s, smb_ucs2_t c, unsigned int n);
 smb_ucs2_t *strstr_w(const smb_ucs2_t *s, const smb_ucs2_t *ins);
 bool strlower_w(smb_ucs2_t *s);
 bool strupper_w(smb_ucs2_t *s);
-void strnorm_w(smb_ucs2_t *s, int case_default);
 int strcmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b);
-int strncmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len);
 int strcasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b);
 int strncasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len);
 smb_ucs2_t *strdup_w(const smb_ucs2_t *src);

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 4f4f65cbc094502382431edbf69f2d9d4a4142e3..90fc6769f9b7dbe746ae83609c8b8dda80fb967c 100644 (file)
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -34,6 +34,7 @@ static bool initialized;
 /* return an ascii version of a ucs2 character */
 #define UCS2_TO_CHAR(c) (((c) >> UCS2_SHIFT) & 0xff)
 
+static int strncmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len);
 
 /**
  * Destroy global objects allocated by load_case_tables()
@@ -295,19 +296,6 @@ bool strupper_w(smb_ucs2_t *s)
        return ret;
 }
 
-/*******************************************************************
- Convert a string to "normal" form.
-********************************************************************/
-
-void strnorm_w(smb_ucs2_t *s, int case_default)
-{
-       if (case_default == CASE_UPPER) {
-               strupper_w(s);
-       } else {
-               strlower_w(s);
-       }
-}
-
 int strcmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b)
 {
        smb_ucs2_t cpa, cpb;
@@ -322,7 +310,7 @@ int strcmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b)
                string is longer */
 }
 
-int strncmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len)
+static int strncmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len)
 {
        smb_ucs2_t cpa, cpb;
        size_t n = 0;