X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils_cmd_getval.c;h=3df13b17e7d8f594c160205d7d22f24926634a27;hb=79963d13c1884d1d92667cc502ad20758b084a12;hp=cd88760a3746f01e4dee0a25f121987553e48ae8;hpb=51181b899668ad2c232a152d6e5e787c4eb049cc;p=collectd.git

diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c
index cd88760a..3df13b17 100644
--- a/src/utils_cmd_getval.c
+++ b/src/utils_cmd_getval.c
@@ -30,22 +30,21 @@
 #include "plugin.h"
 
 #include "utils_cache.h"
-#include "utils_parse_option.h"
 #include "utils_cmd_getval.h"
+#include "utils_parse_option.h"
 
-#define print_to_socket(fh, ...) \
-  do { \
-    if (fprintf (fh, __VA_ARGS__) < 0) { \
-      char errbuf[1024]; \
-      WARNING ("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("handle_getval: failed to write to socket #%i: %s", fileno(fh),  \
+              sstrerror(errno, errbuf, sizeof(errbuf)));                       \
+      return -1;                                                               \
+    }                                                                          \
+    fflush(fh);                                                                \
   } while (0)
 
-int handle_getval (FILE *fh, char *buffer)
-{
+int handle_getval(FILE *fh, char *buffer) {
   char *command;
   char *identifier;
   char *identifier_copy;
@@ -60,106 +59,93 @@ int handle_getval (FILE *fh, char *buffer)
 
   const data_set_t *ds;
 
-  int   status;
+  int status;
 
   if ((fh == NULL) || (buffer == NULL))
     return (-1);
 
-  DEBUG ("utils_cmd_getval: handle_getval (fh = %p, buffer = %s);",
-      (void *) fh, buffer);
+  DEBUG("utils_cmd_getval: handle_getval (fh = %p, buffer = %s);", (void *)fh,
+        buffer);
 
   command = NULL;
-  status = parse_string (&buffer, &command);
-  if (status != 0)
-  {
-    print_to_socket (fh, "-1 Cannot parse command.\n");
+  status = parse_string(&buffer, &command);
+  if (status != 0) {
+    print_to_socket(fh, "-1 Cannot parse command.\n");
     return (-1);
   }
-  assert (command != NULL);
+  assert(command != NULL);
 
-  if (strcasecmp ("GETVAL", command) != 0)
-  {
-    print_to_socket (fh, "-1 Unexpected command: `%s'.\n", command);
+  if (strcasecmp("GETVAL", command) != 0) {
+    print_to_socket(fh, "-1 Unexpected command: `%s'.\n", command);
     return (-1);
   }
 
   identifier = NULL;
-  status = parse_string (&buffer, &identifier);
-  if (status != 0)
-  {
-    print_to_socket (fh, "-1 Cannot parse identifier.\n");
+  status = parse_string(&buffer, &identifier);
+  if (status != 0) {
+    print_to_socket(fh, "-1 Cannot parse identifier.\n");
     return (-1);
   }
-  assert (identifier != NULL);
+  assert(identifier != NULL);
 
-  if (*buffer != 0)
-  {
-    print_to_socket (fh, "-1 Garbage after end of command: %s\n", buffer);
+  if (*buffer != 0) {
+    print_to_socket(fh, "-1 Garbage after end of command: %s\n", buffer);
     return (-1);
   }
 
   /* parse_identifier() modifies its first argument,
    * returning pointers into it */
-  identifier_copy = sstrdup (identifier);
-
-  status = parse_identifier (identifier_copy, &hostname,
-      &plugin, &plugin_instance,
-      &type, &type_instance);
-  if (status != 0)
-  {
-    DEBUG ("handle_getval: Cannot parse identifier `%s'.", identifier);
-    print_to_socket (fh, "-1 Cannot parse identifier `%s'.\n", identifier);
-    sfree (identifier_copy);
+  identifier_copy = sstrdup(identifier);
+
+  status = parse_identifier(identifier_copy, &hostname, &plugin,
+                            &plugin_instance, &type, &type_instance);
+  if (status != 0) {
+    DEBUG("handle_getval: Cannot parse identifier `%s'.", identifier);
+    print_to_socket(fh, "-1 Cannot parse identifier `%s'.\n", identifier);
+    sfree(identifier_copy);
     return (-1);
   }
 
-  ds = plugin_get_ds (type);
-  if (ds == NULL)
-  {
-    DEBUG ("handle_getval: plugin_get_ds (%s) == NULL;", type);
-    print_to_socket (fh, "-1 Type `%s' is unknown.\n", type);
-    sfree (identifier_copy);
+  ds = plugin_get_ds(type);
+  if (ds == NULL) {
+    DEBUG("handle_getval: plugin_get_ds (%s) == NULL;", type);
+    print_to_socket(fh, "-1 Type `%s' is unknown.\n", type);
+    sfree(identifier_copy);
     return (-1);
   }
 
   values = NULL;
   values_num = 0;
-  status = uc_get_rate_by_name (identifier, &values, &values_num);
-  if (status != 0)
-  {
-    print_to_socket (fh, "-1 No such value\n");
-    sfree (identifier_copy);
+  status = uc_get_rate_by_name(identifier, &values, &values_num);
+  if (status != 0) {
+    print_to_socket(fh, "-1 No such value\n");
+    sfree(identifier_copy);
     return (-1);
   }
 
-  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);
-    print_to_socket (fh, "-1 Error reading value from cache.\n");
-    sfree (values);
-    sfree (identifier_copy);
+  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);
+    print_to_socket(fh, "-1 Error reading value from cache.\n");
+    sfree(values);
+    sfree(identifier_copy);
     return (-1);
   }
 
-  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);
-  sfree (identifier_copy);
+  sfree(values);
+  sfree(identifier_copy);
 
   return (0);
 } /* int handle_getval */