diff options
author | Jeremy Allison <jra@samba.org> | 2005-08-12 20:12:31 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:00:29 -0500 |
commit | e4edd9527595faf480b80bf2b2df0392565ea51f (patch) | |
tree | 648424ae875c7ec111c530354b3d27291c0378ee /source3/lib/util_str.c | |
parent | 3bda33caf0ef6ced2a7a87b9082f14dc76631027 (diff) | |
download | samba-e4edd9527595faf480b80bf2b2df0392565ea51f.tar.gz samba-e4edd9527595faf480b80bf2b2df0392565ea51f.tar.xz samba-e4edd9527595faf480b80bf2b2df0392565ea51f.zip |
r9271: Fix problems with german umlauts - strcmp_w was broken (needs to always re-call macro
on termination). Fix all other cases where this was also occurring.
Jeremy.
(This used to be commit 816e2fbb39b544b7f62d5351f3a8e0af63717227)
Diffstat (limited to 'source3/lib/util_str.c')
-rw-r--r-- | source3/lib/util_str.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 06f9018269..712a8a18fd 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -183,7 +183,7 @@ char **toktocliplist(int *ctok, const char *sep) int StrCaseCmp(const char *s, const char *t) { - const char * ps, * pt; + const char *ps, *pt; size_t size; smb_ucs2_t *buffer_s, *buffer_t; int ret; @@ -211,17 +211,17 @@ int StrCaseCmp(const char *s, const char *t) return +1; } - size = push_ucs2_allocate(&buffer_s, s); + size = push_ucs2_allocate(&buffer_s, ps); if (size == (size_t)-1) { - return strcmp(s, t); + return strcmp(ps, pt); /* Not quite the right answer, but finding the right one under this failure case is expensive, and it's pretty close */ } - size = push_ucs2_allocate(&buffer_t, t); + size = push_ucs2_allocate(&buffer_t, pt); if (size == (size_t)-1) { SAFE_FREE(buffer_s); - return strcmp(s, t); + return strcmp(ps, pt); /* Not quite the right answer, but finding the right one under this failure case is expensive, and it's pretty close */ } |