cmds: s/metric_t/metric_single_t/

diff --git a/src/utils/cmds/getthreshold.c b/src/utils/cmds/getthreshold.c
index c40495191a557954d13984d162306938e0d0072c..f8f1df243e1addbd97df261b38cd94808def4b1c 100644 (file)
--- a/src/utils/cmds/getthreshold.c
+++ b/src/utils/cmds/getthreshold.c
@@ -82,9 +82,9 @@ int handle_getthreshold(FILE *fh, char *buffer) {
   char *plugin = NULL;
   char *type = NULL;
   char *data_source = NULL;
-  status = parse_identifier(identifier_copy, &host, &plugin,
-                            &type, &data_source,
-                            /* default_host = */ NULL);
+  status =
+      parse_identifier(identifier_copy, &host, &plugin, &type, &data_source,
+                       /* default_host = */ NULL);
   if (status != 0) {
     DEBUG("handle_getthreshold: Cannot parse identifier `%s'.", identifier);
     print_to_socket(fh, "-1 Cannot parse identifier `%s'.\n", identifier);
@@ -94,23 +94,23 @@ int handle_getthreshold(FILE *fh, char *buffer) {
 
   char *plugin_instance = strchr(plugin, '-');
   if (plugin_instance != NULL) {
-         *plugin_instance = 0;
-         plugin_instance++;
+    *plugin_instance = 0;
+    plugin_instance++;
   }
   char *type_instance = strchr(type, '-');
   if (type_instance != NULL) {
-         *type_instance = 0;
-         type_instance++;
+    *type_instance = 0;
+    type_instance++;
   }
 
-  metric_t m = {
-         .identity = identity_create_legacy(plugin, type, data_source, host),
+  metric_single_t m = {
+      .identity = identity_create_legacy(plugin, type, data_source, host),
   };
   if (plugin_instance != NULL) {
-         identity_add_label(m.identity, "plugin_instance", plugin_instance);
+    identity_add_label(m.identity, "plugin_instance", plugin_instance);
   }
   if (type_instance != NULL) {
-         identity_add_label(m.identity, "type_instance", type_instance);
+    identity_add_label(m.identity, "type_instance", type_instance);
   }
 
   sfree(identifier_copy);

diff --git a/src/utils/cmds/putval.c b/src/utils/cmds/putval.c
index 9a9c774686a162c8962af3da93214da3cb46dc4f..769ea469218a32c84222a44e04c67ebaf35fd168 100644 (file)
--- a/src/utils/cmds/putval.c
+++ b/src/utils/cmds/putval.c
@@ -44,7 +44,8 @@ static int is_quoted(char const *str, size_t len) {
 }
 
 /* TODO(octo): add an option to set metric->value_type */
-static int set_option(metric_t *m, char const *key, char const *value, cmd_error_handler_t *err) {
+static int set_option(metric_single_t *m, char const *key, char const *value,
+                      cmd_error_handler_t *err) {
   if ((m == NULL) || (key == NULL) || (value == NULL))
     return -1;
 
@@ -107,7 +108,8 @@ cmd_status_t cmd_parse_putval(size_t argc, char **argv,
   }
 
   if (argc < 2) {
-    cmd_error(CMD_PARSE_ERROR, errhndl, "Missing identifier and/or value-list.");
+    cmd_error(CMD_PARSE_ERROR, errhndl,
+              "Missing identifier and/or value-list.");
     return CMD_PARSE_ERROR;
   }
 
@@ -116,15 +118,17 @@ cmd_status_t cmd_parse_putval(size_t argc, char **argv,
   identity_t *id = identity_unmarshal_text(identifier);
   if (id == NULL) {
     int err = errno;
-    DEBUG("cmd_handle_putval: Parsing identifier \"%s\" failed: %s.", identifier, STRERROR(err));
-    cmd_error(CMD_PARSE_ERROR, errhndl, "Parsing identifier \"%s\" failed: %s.", identifier, STRERROR(err));
+    DEBUG("cmd_handle_putval: Parsing identifier \"%s\" failed: %s.",
+          identifier, STRERROR(err));
+    cmd_error(CMD_PARSE_ERROR, errhndl, "Parsing identifier \"%s\" failed: %s.",
+              identifier, STRERROR(err));
     return CMD_PARSE_ERROR;
   }
 
-  metric_t metric = {
-    .identity = id,
-    .value = (value_t){.gauge = NAN},
-    .value_type = VALUE_TYPE_GAUGE,
+  metric_single_t metric = {
+      .identity = id,
+      .value = (value_t){.gauge = NAN},
+      .value_type = VALUE_TYPE_GAUGE,
   };
 
   ret_putval->raw_identifier = strdup(identifier);
@@ -221,9 +225,10 @@ cmd_status_t cmd_handle_putval(FILE *fh, char *buffer) {
 
   status = plugin_dispatch_metric_list(cmd.cmd.putval.ml);
   if (status != 0) {
-      cmd_error(CMD_ERROR, &err, "plugin_dispatch_metric_list failed with status %d.", status);
-      cmd_destroy(&cmd);
-      return CMD_ERROR;
+    cmd_error(CMD_ERROR, &err,
+              "plugin_dispatch_metric_list failed with status %d.", status);
+    cmd_destroy(&cmd);
+    return CMD_ERROR;
   }
 
   if (fh != stdout) {
@@ -232,8 +237,8 @@ cmd_status_t cmd_handle_putval(FILE *fh, char *buffer) {
     for (metrics_list_t *ml = putval->ml; ml != NULL; ml = ml->next_p) {
       n++;
     }
-    cmd_error(CMD_OK, &err, "Success: %i %s been dispatched.",
-        n, (n == 1) ? "metric has" : "metrics have");
+    cmd_error(CMD_OK, &err, "Success: %i %s been dispatched.", n,
+              (n == 1) ? "metric has" : "metrics have");
   }
 
   cmd_destroy(&cmd);
@@ -252,7 +257,7 @@ cmd_status_t cmd_handle_putval(FILE *fh, char *buffer) {
  *   PUTVAL metric_name label:key="value" interval=10.000 42
  */
 int cmd_create_putval(char *ret, size_t ret_len, /* {{{ */
-                      metric_t const *m) {
+                      metric_single_t const *m) {
   strbuf_t id_buf = STRBUF_CREATE;
   int status = identity_marshal_text(&id_buf, m->identity);
   if (status != 0) {

diff --git a/src/utils/cmds/putval.h b/src/utils/cmds/putval.h
index 3d0b16501a9807da948f73fa21f6ae7cc4fa10e8..094dc5d66b98fefb16dd7072275111ab0583b126 100644 (file)
--- a/src/utils/cmds/putval.h
+++ b/src/utils/cmds/putval.h
@@ -41,6 +41,6 @@ cmd_status_t cmd_handle_putval(FILE *fh, char *buffer);
 
 void cmd_destroy_putval(cmd_putval_t *putval);
 
-int cmd_create_putval(char *ret, size_t ret_len, const metric_t *metric_p);
+int cmd_create_putval(char *ret, size_t ret_len, metric_single_t const *m);
 
 #endif /* UTILS_CMD_PUTVAL_H */