CLEANUP: Reapply ist.cocci (3)

This reapplies ist.cocci across the whole src/ tree.

diff --git a/src/resolvers.c b/src/resolvers.c
index f97fb29b019d34df0f24ad069ff2e7c6f8f5ed98..d68208555f1c60ab14d1b928a76735312afae098 100644 (file)
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -3947,9 +3947,9 @@ static int rslv_promex_fill_ts(void *unused, void *metric_ctx, unsigned int id,
        int ret;
 
        labels[0].name  = ist("resolver");
-       labels[0].value = ist2(resolver->id, strlen(resolver->id));
+       labels[0].value = ist(resolver->id);
        labels[1].name  = ist("nameserver");
-       labels[1].value = ist2(ns->id, strlen(ns->id));
+       labels[1].value = ist(ns->id);
 
        ret = resolv_fill_stats(ns->counters, stats, &id);
        if (ret == 1)

diff --git a/src/stick_table.c b/src/stick_table.c
index 4379ac2f39c5edbb30b7bff04d8201554f35cefb..3dbf0025983c079413a3710b221d27eabeed8965 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -5947,9 +5947,9 @@ static int stk_promex_fill_ts(void *unused, void *metric_ctx, unsigned int id, s
                return 0;
 
        labels[0].name  = ist("name");
-       labels[0].value = ist2(t->id, strlen(t->id));
+       labels[0].value = ist(t->id);
        labels[1].name  = ist("type");
-       labels[1].value = ist2(stktable_types[t->type].kw, strlen(stktable_types[t->type].kw));
+       labels[1].value = ist(stktable_types[t->type].kw);
 
        switch (id) {
                case STICKTABLE_SIZE: