r17930: Merge noinclude branch:

[kai/samba.git] / source4 / lib / util / util_str.c

diff --git a/source4/lib/util/util_str.c b/source4/lib/util/util_str.c
index df9fd44cd6ba28eee8457e0d477bde86e65c1e80..163ef3828ef9ff7b3301c724bdc1cc96f52ad989 100644 (file)
--- a/source4/lib/util/util_str.c
+++ b/source4/lib/util/util_str.c
@@ -23,10 +23,10 @@
 */
 
 #include "includes.h"
-#include "smb.h"
+#include "libcli/raw/smb.h"
 #include "pstring.h"
 #include "lib/ldb/include/ldb.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 
 /**
  * @file
@@ -775,8 +775,9 @@ _PUBLIC_ int strwicmp(const char *psz1, const char *psz2)
 **/
 _PUBLIC_ void string_replace(char *s, char oldc, char newc)
 {
-       for (;s && *s; s++) {
+       while (*s) {
                if (*s == oldc) *s = newc;
+               s++;
        }
 }