X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_getval.c;h=59046f6944cbe9d5c6fbdee1774843f71eddfdbf;hp=76af189477c9205f5e2a125e228789c95b78b7e4;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=6e6c1eecf05ac8bc9e59b0967cb87e578253d5a0

diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c
index 76af1894..59046f69 100644
--- a/src/utils_cmd_getval.c
+++ b/src/utils_cmd_getval.c
@@ -30,59 +30,64 @@
 #include "plugin.h"
 
 #include "utils_cache.h"
-#include "utils_parse_option.h"
 #include "utils_cmd_getval.h"
+#include "utils_parse_option.h"
 
-cmd_status_t cmd_parse_getval (size_t argc, char **argv,
-    cmd_getval_t *ret_getval, cmd_error_handler_t *err)
-{
+cmd_status_t cmd_parse_getval(size_t argc, char **argv,
+                              cmd_getval_t *ret_getval,
+                              const cmd_options_t *opts,
+                              cmd_error_handler_t *err) {
   char *identifier_copy;
   int status;
 
-  if (argc != 1)
-  {
+  if ((ret_getval == NULL) || (opts == NULL)) {
+    errno = EINVAL;
+    cmd_error(CMD_ERROR, err, "Invalid arguments to cmd_parse_getval.");
+    return CMD_ERROR;
+  }
+
+  if (argc != 1) {
     if (argc == 0)
-      cmd_error (CMD_PARSE_ERROR, err, "Missing identifier.");
+      cmd_error(CMD_PARSE_ERROR, err, "Missing identifier.");
     else
-      cmd_error (CMD_PARSE_ERROR, err,
-	  "Garbage after identifier: `%s'.", argv[1]);
-    return (CMD_PARSE_ERROR);
+      cmd_error(CMD_PARSE_ERROR, err, "Garbage after identifier: `%s'.",
+                argv[1]);
+    return CMD_PARSE_ERROR;
   }
 
   /* parse_identifier() modifies its first argument,
    * returning pointers into it */
-  identifier_copy = sstrdup (argv[0]);
-
-  status = parse_identifier (argv[0], &ret_getval->identifier.host,
-      &ret_getval->identifier.plugin, &ret_getval->identifier.plugin_instance,
-      &ret_getval->identifier.type, &ret_getval->identifier.type_instance);
-  if (status != 0)
-  {
-    DEBUG ("cmd_parse_getval: Cannot parse identifier `%s'.", identifier_copy);
-    cmd_error (CMD_PARSE_ERROR, err,
-	"Cannot parse identifier `%s'.", identifier_copy);
-    sfree (identifier_copy);
-    return (CMD_PARSE_ERROR);
+  identifier_copy = sstrdup(argv[0]);
+
+  status = parse_identifier(
+      argv[0], &ret_getval->identifier.host, &ret_getval->identifier.plugin,
+      &ret_getval->identifier.plugin_instance, &ret_getval->identifier.type,
+      &ret_getval->identifier.type_instance, opts->identifier_default_host);
+  if (status != 0) {
+    DEBUG("cmd_parse_getval: Cannot parse identifier `%s'.", identifier_copy);
+    cmd_error(CMD_PARSE_ERROR, err, "Cannot parse identifier `%s'.",
+              identifier_copy);
+    sfree(identifier_copy);
+    return CMD_PARSE_ERROR;
   }
 
   ret_getval->raw_identifier = identifier_copy;
-  return (CMD_OK);
+  return CMD_OK;
 } /* cmd_status_t cmd_parse_getval */
 
-#define print_to_socket(fh, ...) \
-  do { \
-    if (fprintf (fh, __VA_ARGS__) < 0) { \
-      char errbuf[1024]; \
-      WARNING ("cmd_handle_getval: failed to write to socket #%i: %s", \
-          fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-      return -1; \
-    } \
-    fflush(fh); \
+#define print_to_socket(fh, ...)                                               \
+  do {                                                                         \
+    if (fprintf(fh, __VA_ARGS__) < 0) {                                        \
+      char errbuf[1024];                                                       \
+      WARNING("cmd_handle_getval: failed to write to socket #%i: %s",          \
+              fileno(fh), sstrerror(errno, errbuf, sizeof(errbuf)));           \
+      return -1;                                                               \
+    }                                                                          \
+    fflush(fh);                                                                \
   } while (0)
 
-cmd_status_t cmd_handle_getval (FILE *fh, char *buffer)
-{
-  cmd_error_handler_t err = { cmd_error_fh, fh };
+cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) {
+  cmd_error_handler_t err = {cmd_error_fh, fh};
   cmd_status_t status;
   cmd_t cmd;
 
@@ -91,82 +96,71 @@ cmd_status_t cmd_handle_getval (FILE *fh, char *buffer)
 
   const data_set_t *ds;
 
-
   if ((fh == NULL) || (buffer == NULL))
-    return (-1);
-
-  DEBUG ("utils_cmd_getval: cmd_handle_getval (fh = %p, buffer = %s);",
-      (void *) fh, buffer);
-
-  if ((status = cmd_parse (buffer, &cmd, &err)) != CMD_OK)
-    return (status);
-  if (cmd.type != CMD_GETVAL)
-  {
-    cmd_error (CMD_UNKNOWN_COMMAND, &err,
-	"Unexpected command: `%s'.", CMD_TO_STRING (cmd.type));
-    cmd_destroy (&cmd);
-    return (CMD_UNKNOWN_COMMAND);
+    return -1;
+
+  DEBUG("utils_cmd_getval: cmd_handle_getval (fh = %p, buffer = %s);",
+        (void *)fh, buffer);
+
+  if ((status = cmd_parse(buffer, &cmd, NULL, &err)) != CMD_OK)
+    return status;
+  if (cmd.type != CMD_GETVAL) {
+    cmd_error(CMD_UNKNOWN_COMMAND, &err, "Unexpected command: `%s'.",
+              CMD_TO_STRING(cmd.type));
+    cmd_destroy(&cmd);
+    return CMD_UNKNOWN_COMMAND;
   }
 
-  ds = plugin_get_ds (cmd.cmd.getval.identifier.type);
-  if (ds == NULL)
-  {
-    DEBUG ("cmd_handle_getval: plugin_get_ds (%s) == NULL;",
-	cmd.cmd.getval.identifier.type);
-    cmd_error (CMD_ERROR, &err, "Type `%s' is unknown.\n",
-	cmd.cmd.getval.identifier.type);
-    cmd_destroy (&cmd);
-    return (-1);
+  ds = plugin_get_ds(cmd.cmd.getval.identifier.type);
+  if (ds == NULL) {
+    DEBUG("cmd_handle_getval: plugin_get_ds (%s) == NULL;",
+          cmd.cmd.getval.identifier.type);
+    cmd_error(CMD_ERROR, &err, "Type `%s' is unknown.\n",
+              cmd.cmd.getval.identifier.type);
+    cmd_destroy(&cmd);
+    return -1;
   }
 
   values = NULL;
   values_num = 0;
-  status = uc_get_rate_by_name (cmd.cmd.getval.raw_identifier, &values, &values_num);
-  if (status != 0)
-  {
-    cmd_error (CMD_ERROR, &err, "No such value.");
-    cmd_destroy (&cmd);
-    return (CMD_ERROR);
+  status =
+      uc_get_rate_by_name(cmd.cmd.getval.raw_identifier, &values, &values_num);
+  if (status != 0) {
+    cmd_error(CMD_ERROR, &err, "No such value.");
+    cmd_destroy(&cmd);
+    return CMD_ERROR;
   }
 
-  if (ds->ds_num != values_num)
-  {
-    ERROR ("ds[%s]->ds_num = %zu, "
-	"but uc_get_rate_by_name returned %zu values.",
-	ds->type, ds->ds_num, values_num);
-    cmd_error (CMD_ERROR, &err, "Error reading value from cache.");
-    sfree (values);
-    cmd_destroy (&cmd);
-    return (CMD_ERROR);
+  if (ds->ds_num != values_num) {
+    ERROR("ds[%s]->ds_num = %zu, "
+          "but uc_get_rate_by_name returned %zu values.",
+          ds->type, ds->ds_num, values_num);
+    cmd_error(CMD_ERROR, &err, "Error reading value from cache.");
+    sfree(values);
+    cmd_destroy(&cmd);
+    return CMD_ERROR;
   }
 
-  print_to_socket (fh, "%zu Value%s found\n", values_num,
-      (values_num == 1) ? "" : "s");
-  for (size_t i = 0; i < values_num; i++)
-  {
-    print_to_socket (fh, "%s=", ds->ds[i].name);
-    if (isnan (values[i]))
-    {
-      print_to_socket (fh, "NaN\n");
-    }
-    else
-    {
-      print_to_socket (fh, "%12e\n", values[i]);
+  print_to_socket(fh, "%zu Value%s found\n", values_num,
+                  (values_num == 1) ? "" : "s");
+  for (size_t i = 0; i < values_num; i++) {
+    print_to_socket(fh, "%s=", ds->ds[i].name);
+    if (isnan(values[i])) {
+      print_to_socket(fh, "NaN\n");
+    } else {
+      print_to_socket(fh, "%12e\n", values[i]);
     }
   }
 
-  sfree (values);
-  cmd_destroy (&cmd);
+  sfree(values);
+  cmd_destroy(&cmd);
 
-  return (CMD_OK);
+  return CMD_OK;
 } /* cmd_status_t cmd_handle_getval */
 
-void cmd_destroy_getval (cmd_getval_t *getval)
-{
+void cmd_destroy_getval(cmd_getval_t *getval) {
   if (getval == NULL)
     return;
 
-  sfree (getval->raw_identifier);
+  sfree(getval->raw_identifier);
 } /* void cmd_destroy_getval */
-
-/* vim: set sw=2 sts=2 ts=8 : */