Author: jra Date: 2005-08-02 17:52:41 +0000 (Tue, 02 Aug 2005) New Revision: 8927
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8927 Log: Fix mangle method = hash - bugid #2946. Incorrect strcmp_wa and strncmp_wa. Jeremy. Modified: trunk/source/lib/util_unistr.c Changeset: Modified: trunk/source/lib/util_unistr.c =================================================================== --- trunk/source/lib/util_unistr.c 2005-08-02 17:46:28 UTC (rev 8926) +++ trunk/source/lib/util_unistr.c 2005-08-02 17:52:41 UTC (rev 8927) @@ -815,7 +815,7 @@ a++; b++; } - return (cp - UCS2_CHAR(*b)); + return (*(COPY_UCS2_CHAR(&cp,a)) - UCS2_CHAR(*b)); } int strncmp_wa(const smb_ucs2_t *a, const char *b, size_t len) @@ -828,7 +828,7 @@ b++; n++; } - return (len - n)?(cp - UCS2_CHAR(*b)):0; + return (len - n)?(*(COPY_UCS2_CHAR(&cp,a)) - UCS2_CHAR(*b)):0; } smb_ucs2_t *strpbrk_wa(const smb_ucs2_t *s, const char *p)