diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-12 16:16:22 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-04-13 14:47:07 +1000 |
| commit | d458f6b3bd7043bb78953bdc48ee6e2dcb034042 (patch) | |
| tree | 48599d563a37cf915ab57a4debeb848f66f7637f | |
| parent | a82fba349989376397dbbb07ca3212713424c411 (diff) | |
| download | samba-d458f6b3bd7043bb78953bdc48ee6e2dcb034042.tar.gz samba-d458f6b3bd7043bb78953bdc48ee6e2dcb034042.tar.bz2 samba-d458f6b3bd7043bb78953bdc48ee6e2dcb034042.zip | |
s3-lib make static and remove more _w functions
Signed-off-by: Andrew Tridgell <tridge@samba.org>
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/lib/util_unistr.c | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 4b7fda106c..2ffff4c137 100644 --- 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 4f4f65cbc0..90fc6769f9 100644 --- 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; |