X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_subst_test.c;h=c6caba20f29293883c81a4eaa3895ff38247f6dd;hb=c76419c0cf983f1ecd3d36aa236cc4e3f9cff733;hp=ec2e3514f2d11f4d14c1ff246478281b0da17db7;hpb=b1b0aa549005c62b0e4651053198693e33ea84f0;p=collectd.git diff --git a/src/daemon/utils_subst_test.c b/src/daemon/utils_subst_test.c index ec2e3514..c6caba20 100644 --- a/src/daemon/utils_subst_test.c +++ b/src/daemon/utils_subst_test.c @@ -26,6 +26,7 @@ #include "common.h" /* for STATIC_ARRAY_SIZE */ #include "collectd.h" + #include "testing.h" #include "utils_subst.h" @@ -36,11 +37,11 @@ kstat_ctl_t *kc; DEF_TEST(subst) { struct { - char *str; + const char *str; int off1; int off2; - char *rplmt; - char *want; + const char *rplmt; + const char *want; } cases[] = { {"foo_____bar", 3, 8, " - ", "foo - bar"}, /* documentation example */ {"foo bar", 0, 2, "m", "mo bar"}, /* beginning, shorten */ @@ -75,9 +76,8 @@ DEF_TEST(subst) {"foo bar", 4, 3, "_", NULL}, /* off1 > off2 */ {"foo bar", 3, 4, NULL, NULL}, /* no replacement */ }; - size_t i; - for (i = 0; i < STATIC_ARRAY_SIZE (cases); i++) { + for (size_t i = 0; i < STATIC_ARRAY_SIZE (cases); i++) { char buffer[16] = "!!!!!!!!!!!!!!!"; if (cases[i].want == NULL) { @@ -95,7 +95,10 @@ DEF_TEST(subst) DEF_TEST(subst_string) { struct { - char *str; char *srch; char *rplmt; char *want; + const char *str; + const char *srch; + const char *rplmt; + const char *want; } cases[] = { {"Hello %{name}", "%{name}", "world", "Hello world"}, {"abcccccc", "abc", "cab", "ccccccab"}, @@ -105,9 +108,8 @@ DEF_TEST(subst_string) {"foo bar", "oo", "oo", "foo bar"}, {"sixteen chars", "chars", "characters", "sixteen charact"}, }; - size_t i; - for (i = 0; i < STATIC_ARRAY_SIZE (cases); i++) { + for (size_t i = 0; i < STATIC_ARRAY_SIZE (cases); i++) { char buffer[16]; if (cases[i].want == NULL) {