summaryrefslogtreecommitdiff
path: root/source4/lib/util/util_str.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-24 15:55:26 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:11 -0500
commitf2d64e1c45994e4b519454c071e90e0cd8240c8a (patch)
tree9a287ebd6f970a2d87b9a0c525b347d43b79b281 /source4/lib/util/util_str.c
parent385622396d4bf30b3775d24a7da7ee0c08f07ddd (diff)
downloadsamba-f2d64e1c45994e4b519454c071e90e0cd8240c8a.tar.gz
samba-f2d64e1c45994e4b519454c071e90e0cd8240c8a.tar.bz2
samba-f2d64e1c45994e4b519454c071e90e0cd8240c8a.zip
r25306: Add tests for string_sub().
(This used to be commit 2d37ddcbd1243f48d81af17d8ea3cdd6e8e35b8d)
Diffstat (limited to 'source4/lib/util/util_str.c')
-rw-r--r--source4/lib/util/util_str.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/util/util_str.c b/source4/lib/util/util_str.c
index 0f1f2d5a1c..e9f81dbd9b 100644
--- a/source4/lib/util/util_str.c
+++ b/source4/lib/util/util_str.c
@@ -274,7 +274,7 @@ _PUBLIC_ char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_
_PUBLIC_ void string_sub(char *s, const char *pattern, const char *insert, size_t len)
{
char *p;
- ssize_t ls,lp,li, i;
+ ssize_t ls, lp, li, i;
if (!insert || !pattern || !*pattern || !s)
return;
@@ -286,7 +286,7 @@ _PUBLIC_ void string_sub(char *s, const char *pattern, const char *insert, size_
if (len == 0)
len = ls + 1; /* len is number of *bytes* */
- while (lp <= ls && (p = strstr(s,pattern))) {
+ while (lp <= ls && (p = strstr(s, pattern))) {
if (ls + (li-lp) >= len) {
DEBUG(0,("ERROR: string overflow by %d in string_sub(%.50s, %d)\n",
(int)(ls + (li-lp) - len),