curl_json plugin: Use the global config helper functions.

[collectd.git] / src / utils_subst.c

diff --git a/src/utils_subst.c b/src/utils_subst.c
index 3c9fe5a..a49f6db 100644 (file)
--- a/src/utils_subst.c
+++ b/src/utils_subst.c
@@ -37,7 +37,8 @@ char *subst (char *buf, size_t buflen, const char *string, int off1, int off2,
                        || (NULL == replacement))
                return NULL;
 
-       sstrncpy (buf_ptr, string, (off1 + 1 > buflen) ? buflen : off1 + 1);
+       sstrncpy (buf_ptr, string,
+                       ((size_t)off1 + 1 > buflen) ? buflen : (size_t)off1 + 1);
        buf_ptr += off1;
        len     -= off1;
 
@@ -128,7 +129,7 @@ char *subst_string (char *buf, size_t buflen, const char *string,
                strncpy (buf, temp, buflen);
        }
 
-       if (i >= 100)
+       if (i >= buflen)
        {
                WARNING ("subst_string: Loop exited after %zu iterations: "
                                "string = %s; needle = %s; replacement = %s;",