From 8fcda44a1f70f0d6d0076620a672b99a2798a2f4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 12 Apr 2011 15:59:51 +1000 Subject: s3-lib: Remove unused _w functions. In general we don't manipulate UTF16 strings internally, particularly as they are also multibyte, so are no easier to work with than UTF8. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/include/proto.h | 12 ------------ source3/include/smb_macros.h | 1 - 2 files changed, 13 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index 4618dfaf11..36ce634300 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1069,20 +1069,8 @@ 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); -bool strequal_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2); -bool strnequal_w(const smb_ucs2_t *s1,const smb_ucs2_t *s2,size_t n); smb_ucs2_t *strdup_w(const smb_ucs2_t *src); -smb_ucs2_t *strndup_w(const smb_ucs2_t *src, size_t len); -smb_ucs2_t *strncpy_w(smb_ucs2_t *dest, const smb_ucs2_t *src, const size_t max); -smb_ucs2_t *strncat_w(smb_ucs2_t *dest, const smb_ucs2_t *src, const size_t max); -smb_ucs2_t *strcat_w(smb_ucs2_t *dest, const smb_ucs2_t *src); -void string_replace_w(smb_ucs2_t *s, smb_ucs2_t oldc, smb_ucs2_t newc); -bool trim_string_w(smb_ucs2_t *s, const smb_ucs2_t *front, - const smb_ucs2_t *back); int strcmp_wa(const smb_ucs2_t *a, const char *b); -int strncmp_wa(const smb_ucs2_t *a, const char *b, size_t len); -smb_ucs2_t *strpbrk_wa(const smb_ucs2_t *s, const char *p); -smb_ucs2_t *strstr_wa(const smb_ucs2_t *s, const char *ins); int toupper_ascii(int c); int tolower_ascii(int c); int isupper_ascii(int c); diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 9f4b345b84..93bda975bf 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -181,7 +181,6 @@ copy an IP address from one buffer to another #define IS_DIRECTORY_SEP(c) ((c) == '\\' || (c) == '/') #define unix_format(fname) string_replace(fname,'\\','/') -#define unix_format_w(fname) string_replace_w(fname, UCS2_CHAR('\\'), UCS2_CHAR('/')) /**************************************************************************** Make a file into DOS format. -- cgit