summaryrefslogtreecommitdiff
path: root/source4/lib/util
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-27 19:50:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:04 -0500
commit620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 (patch)
tree15a768135a197cdd7b3acd369c029ce9248e9012 /source4/lib/util
parent710ea949886dd57c66dc6d397e0ea41c89736107 (diff)
downloadsamba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.gz
samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.bz2
samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.zip
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)
Diffstat (limited to 'source4/lib/util')
-rw-r--r--source4/lib/util/util_str.c12
1 files changed, 6 insertions, 6 deletions
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];