From 620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 27 Apr 2006 19:50:13 +0000 Subject: r15298: Fix the build using a few hacks in the build system. Recursive dependencies are now forbidden (the build system will bail out if there are any). I've split up auth_sam.c into auth_sam.c and sam.c. Andrew, please rename sam.c / move its contents to whatever/wherever you think suits best. (This used to be commit 6646384aaf3e7fa2aa798c3e564b94b0617ec4d0) --- source4/lib/util/util_str.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/lib/util/util_str.c') diff --git a/source4/lib/util/util_str.c b/source4/lib/util/util_str.c index 9de27c0777..60419e0510 100644 --- a/source4/lib/util/util_str.c +++ b/source4/lib/util/util_str.c @@ -81,15 +81,15 @@ _PUBLIC_ size_t count_chars(const char *s, char c) size_t count = 0; while (*s) { - size_t size; - codepoint_t c2 = next_codepoint(s, &size); - if (c2 == c) count++; - s += size; + if (*s == c) count++; + s ++; } return count; } + + /** Safe string copy into a known length string. maxlength does not include the terminating zero. @@ -433,12 +433,12 @@ _PUBLIC_ void rfc1738_unescape(char *buf) { char *p=buf; - while ((p=strchr_m(p,'+'))) + while ((p=strchr(p,'+'))) *p = ' '; p = buf; - while (p && *p && (p=strchr_m(p,'%'))) { + while (p && *p && (p=strchr(p,'%'))) { int c1 = p[1]; int c2 = p[2]; -- cgit