bitmap: Avoid shadowing type name with parameter name

[ccan] / ccan / rune / test / run.c

diff --git a/ccan/rune/test/run.c b/ccan/rune/test/run.c
index 6cf33a3dceefce6114f55a70e5354f7f5e211dc0..d90b701c609cc48401029f8988e97dfe660f7f21 100644 (file)
--- a/ccan/rune/test/run.c
+++ b/ccan/rune/test/run.c
@@ -22,10 +22,10 @@ static const char *check(const tal_t *ctx,
                char *endp;
                s64 v = strtol(val, &endp, 10);
                if (*endp == '\0' && endp != val)
-                       return rune_alt_single(ctx, alt, NULL, &v);
+                       return rune_alt_single_int(ctx, alt, v);
+               return rune_alt_single_str(ctx, alt, val, strlen(val));
        }
-
-       return rune_alt_single(ctx, alt, val, NULL);
+       return rune_alt_single_missing(ctx, alt);
 }
 
 int main(void)
@@ -43,7 +43,7 @@ int main(void)
        assert(vecs);
        lines = tal_strsplit(mr, take(vecs), "\n", STR_NO_EMPTY);
 
-       plan_tests(343);
+       plan_tests(355);
 
        for (size_t i = 0; lines[i]; i++) {
                struct rune *rune1, *rune2;
@@ -83,12 +83,12 @@ int main(void)
                        ok1(rune_is_derived_anyversion(rune1, rune2) == NULL);
 
                        restr = rune_restr_new(NULL);
-                       for (size_t i = 4; parts[i]; i+=3) {
+                       for (size_t j = 4; parts[j]; j+=3) {
                                struct rune_altern *alt;
                                alt = rune_altern_new(NULL,
-                                                     parts[i],
-                                                     parts[i+1][0],
-                                                     parts[i+2]);
+                                                     parts[j],
+                                                     parts[j+1][0],
+                                                     parts[j+2]);
                                rune_restr_add_altern(restr, take(alt));
                        }
                        rune_add_restr(rune1, take(restr));