From 0c9adb69858c7572320d18c0fd187dd6e885f17d Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 13 Jan 2004 17:55:43 +0000
Subject: sync HEAD with recent changes in 3.0 (This used to be commit
 c98399e3c9d74e19b7c9d806ca8028b48866931e)

---
 source3/lib/util_str.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index f552b38e67..d93f39696f 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -697,7 +697,7 @@ char *StrnCpy_fn(const char *fn, int line,char *dest,const char *src,size_t n)
 
 	if (!dest) {
 		DEBUG(0,("ERROR: NULL dest in StrnCpy, called from [%s][%d]\n", fn, line));
-		return NULL;
+		return(NULL);
 	}
 
 	if (!src) {
@@ -1196,7 +1196,7 @@ char *strchr_m(const char *src, char c)
 
 	for (s = src; *s && !(((unsigned char)s[0]) & 0x80); s++) {
 		if (*s == c)
-			return s;
+			return (char *)s;
 	}
 
 	if (!*s)
@@ -1244,7 +1244,7 @@ char *strrchr_m(const char *s, char c)
 					break;
 				}
 				/* No - we have a match ! */
-			       	return cp;
+			       	return (char *)cp;
 			}
 		} while (cp-- != s);
 		if (!got_mb)
-- 
cgit