From: Florian Forster <octo@google.com>
Date: Tue, 1 Sep 2020 12:33:47 +0000 (+0200)
Subject: daemon: Remove the label_t type.
X-Git-Tag: 6.0.0-rc0~141^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b42f97ff64f3ea7e98d4ea23e36b44c5c456c4ca;p=thirdparty%2Fcollectd.git

daemon: Remove the label_t type.

It caused problems on Solaris, which also has a "label_t" type and was not used
in the API.
---

diff --git a/src/daemon/metric.c b/src/daemon/metric.c
index 16052be61..344bb4c53 100644
--- a/src/daemon/metric.c
+++ b/src/daemon/metric.c
@@ -66,7 +66,10 @@ static label_pair_t *label_set_read(label_set_t labels, char const *name) {
     return NULL;
   }
 
-  label_t label = {
+  struct {
+    char const *name;
+    char const *value;
+  } label = {
       .name = name,
   };
 
diff --git a/src/daemon/metric.h b/src/daemon/metric.h
index 0419304ed..dbd24e08a 100644
--- a/src/daemon/metric.h
+++ b/src/daemon/metric.h
@@ -64,16 +64,6 @@ typedef struct {
   char *value;
 } label_pair_t;
 
-/* label_t represents a key/value pair. It is similar to label_pair_t, except
- * that is has const fields. label_t is used in function arguments to prevent
- * the called function from modifying its argument. Internally labels are
- * stored as label_pair_t to allow modification, e.g. by targets in the "filter
- * chain". */
-typedef struct {
-  char const *name;
-  char const *value;
-} label_t;
-
 /* label_set_t is a sorted set of labels. */
 typedef struct {
   label_pair_t *ptr;
diff --git a/src/daemon/metric_test.c b/src/daemon/metric_test.c
index 128162046..a3e26be44 100644
--- a/src/daemon/metric_test.c
+++ b/src/daemon/metric_test.c
@@ -98,7 +98,7 @@ DEF_TEST(metric_label_set) {
 DEF_TEST(metric_identity) {
   struct {
     char *name;
-    label_t *labels;
+    label_pair_t *labels;
     size_t labels_num;
     char const *want;
   } cases[] = {
@@ -109,7 +109,7 @@ DEF_TEST(metric_identity) {
       {
           .name = "metric_with_labels",
           .labels =
-              (label_t[]){
+              (label_pair_t[]){
                   {"sorted", "yes"},
                   {"alphabetically", "true"},
               },
@@ -119,7 +119,7 @@ DEF_TEST(metric_identity) {
       {
           .name = "escape_sequences",
           .labels =
-              (label_t[]){
+              (label_pair_t[]){
                   {"newline", "\n"},
                   {"quote", "\""},
                   {"tab", "\t"},
@@ -166,7 +166,7 @@ DEF_TEST(metric_family_append) {
     gauge_t v;
     metric_t *templ;
     int want_err;
-    label_t *want_labels;
+    label_pair_t *want_labels;
     size_t want_labels_num;
     gauge_t want_value;
     cdtime_t want_time;
@@ -181,7 +181,7 @@ DEF_TEST(metric_family_append) {
           .lvalue = "test",
           .v = 42,
           .want_labels =
-              (label_t[]){
+              (label_pair_t[]){
                   {"type", "test"},
               },
           .want_labels_num = 1,
@@ -218,7 +218,7 @@ DEF_TEST(metric_family_append) {
                       },
               },
           .want_labels =
-              (label_t[]){
+              (label_pair_t[]){
                   {"common", "label"},
                   {"type", "test"},
               },
diff --git a/src/utils/format_json/format_json_test.c b/src/utils/format_json/format_json_test.c
index 756a3104d..6fa811f3b 100644
--- a/src/utils/format_json/format_json_test.c
+++ b/src/utils/format_json/format_json_test.c
@@ -40,10 +40,10 @@
 #endif
 
 typedef struct {
-  label_t *expected_labels;
+  label_pair_t *expected_labels;
   size_t expected_labels_num;
 
-  label_t *current_label;
+  label_pair_t *current_label;
 } test_case_t;
 
 #if HAVE_YAJL_V2
@@ -58,7 +58,7 @@ static int test_map_key(void *ctx, unsigned char const *key,
 
   c->current_label = NULL;
   for (i = 0; i < c->expected_labels_num; i++) {
-    label_t *l = c->expected_labels + i;
+    label_pair_t *l = c->expected_labels + i;
     if ((strlen(l->name) == key_len) &&
         (strncmp(l->name, (char const *)key, key_len) == 0)) {
       c->current_label = l;
@@ -93,7 +93,7 @@ static int test_string(void *ctx, unsigned char const *value,
   test_case_t *c = ctx;
 
   if (c->current_label != NULL) {
-    label_t *l = c->current_label;
+    label_pair_t *l = c->current_label;
     char *got;
     int status;
 
@@ -112,7 +112,8 @@ static int test_string(void *ctx, unsigned char const *value,
   return 1; /* continue */
 }
 
-static int expect_json_labels(char *json, label_t *labels, size_t labels_num) {
+static int expect_json_labels(char *json, label_pair_t *labels,
+                              size_t labels_num) {
   yajl_callbacks funcs = {
       .yajl_string = test_string,
       .yajl_map_key = test_map_key,
@@ -134,7 +135,7 @@ static int expect_json_labels(char *json, label_t *labels, size_t labels_num) {
 }
 
 DEF_TEST(notification) {
-  label_t labels[] = {
+  label_pair_t labels[] = {
       {"summary", "this is a message"},
       {"alertname", "collectd_unit_test"},
       {"instance", "example.com"},
diff --git a/src/utils/format_stackdriver/format_stackdriver_test.c b/src/utils/format_stackdriver/format_stackdriver_test.c
index 5992b2aee..8597bcc07 100644
--- a/src/utils/format_stackdriver/format_stackdriver_test.c
+++ b/src/utils/format_stackdriver/format_stackdriver_test.c
@@ -29,7 +29,7 @@ DEF_TEST(sd_format_metric_descriptor) {
   struct {
     char *name;
     metric_type_t type;
-    label_t *labels;
+    label_pair_t *labels;
     size_t labels_num;
     char *want;
   } cases[] = {
@@ -58,7 +58,7 @@ DEF_TEST(sd_format_metric_descriptor) {
           .name = "metric_with_labels",
           .type = METRIC_TYPE_GAUGE,
           .labels =
-              (label_t[]){
+              (label_pair_t[]){
                   {"region", "here be dragons"},
                   {"instance", "example.com"},
               },
@@ -86,7 +86,7 @@ DEF_TEST(sd_format_metric_descriptor) {
         .family = &fam,
     };
     for (size_t j = 0; j < cases[i].labels_num; j++) {
-      label_t *l = cases[i].labels + j;
+      label_pair_t *l = cases[i].labels + j;
       EXPECT_EQ_INT(0, metric_label_set(&m, l->name, l->value));
     }