From a732bcd9d2677dde13cb95859c90edf86fb88984 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 6 Jul 2001 22:32:57 +0000
Subject: fixed strrchr_m (This used to be commit
 f4359b5f7ff891d7fcb5772b589756376ae5d412)

---
 source3/lib/util_unistr.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'source3/lib/util_unistr.c')

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index b90532d7dc..09a9eda3ad 100644
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -95,7 +95,7 @@ int rpcstr_push(void* dest, const char *src, int dest_len, int flags)
  units. Always null terminates.
  Hack alert: uses fixed buffer(s).
 ********************************************************************/
-char *dos_unistrn2(uint16 *src, int len)
+char *dos_unistrn2(const uint16 *src, int len)
 {
 	static char lbufs[8][MAXUNI];
 	static int nexti;
@@ -312,10 +312,9 @@ smb_ucs2_t *strrchr_wa(const smb_ucs2_t *s, char c)
 	int len = strlen_w(s);
 	if (len == 0) return NULL;
 	p += (len-1);
-	while (p != s) {
+	do {
 		if (UCS2_CHAR(c) == *p) return (smb_ucs2_t *)p;
-		p--;
-	}
+	} while (p-- != s);
 	return NULL;
 }
 
-- 
cgit