X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_putnotif.c;h=0085c62bc204aca55f9fd2ad5b8f1469f81c39d6;hp=669ef837b94fa6ff5ae0678f249ddebbe25088b5;hb=1159cb5d383c55a80a0db100b8f7aadcf44740a5;hpb=9c962b99a3acd77f1d6e2499052b47356819511a

diff --git a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c
index 669ef837..0085c62b 100644
--- a/src/utils_cmd_putnotif.c
+++ b/src/utils_cmd_putnotif.c
@@ -29,168 +29,154 @@
 #include "common.h"
 #include "plugin.h"
 
-#include "utils_parse_option.h"
 #include "utils_cmd_putnotif.h"
+#include "utils_parse_option.h"
 
-#define print_to_socket(fh, ...) \
-  do { \
-    if (fprintf (fh, __VA_ARGS__) < 0) { \
-      char errbuf[1024]; \
-      WARNING ("handle_putnotif: 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_putnotif: failed to write to socket #%i: %s",            \
+              fileno(fh), sstrerror(errno, errbuf, sizeof(errbuf)));           \
+      return -1;                                                               \
+    }                                                                          \
+    fflush(fh);                                                                \
   } while (0)
 
-static int set_option_severity (notification_t *n, const char *value)
-{
-  if (strcasecmp (value, "Failure") == 0)
+static int set_option_severity(notification_t *n, const char *value) {
+  if (strcasecmp(value, "Failure") == 0)
     n->severity = NOTIF_FAILURE;
-  else if (strcasecmp (value, "Warning") == 0)
+  else if (strcasecmp(value, "Warning") == 0)
     n->severity = NOTIF_WARNING;
-  else if (strcasecmp (value, "Okay") == 0)
+  else if (strcasecmp(value, "Okay") == 0)
     n->severity = NOTIF_OKAY;
   else
-    return (-1);
+    return -1;
 
-  return (0);
+  return 0;
 } /* int set_option_severity */
 
-static int set_option_time (notification_t *n, const char *value)
-{
+static int set_option_time(notification_t *n, const char *value) {
   char *endptr = NULL;
   double tmp;
 
   errno = 0;
-  tmp = strtod (value, &endptr);
+  tmp = strtod(value, &endptr);
   if ((errno != 0)         /* Overflow */
       || (endptr == value) /* Invalid string */
       || (endptr == NULL)  /* This should not happen */
       || (*endptr != 0))   /* Trailing chars */
-    return (-1);
+    return -1;
 
-  n->time = DOUBLE_TO_CDTIME_T (tmp);
+  n->time = DOUBLE_TO_CDTIME_T(tmp);
 
-  return (0);
+  return 0;
 } /* int set_option_time */
 
-static int set_option (notification_t *n, const char *option, const char *value)
-{
+static int set_option(notification_t *n, const char *option,
+                      const char *value) {
   if ((n == NULL) || (option == NULL) || (value == NULL))
-    return (-1);
+    return -1;
 
-  DEBUG ("utils_cmd_putnotif: set_option (option = %s, value = %s);",
-      option, value);
+  DEBUG("utils_cmd_putnotif: set_option (option = %s, value = %s);", option,
+        value);
 
   /* Add a meta option in the form: <type>:<key> */
   if (option[0] != '\0' && option[1] == ':') {
     /* Refuse empty key */
     if (option[2] == '\0')
-      return (1);
+      return 1;
 
     if (option[0] == 's')
-      return plugin_notification_meta_add_string (n, option + 2, value);
+      return plugin_notification_meta_add_string(n, option + 2, value);
     else
-      return (1);
+      return 1;
   }
 
-  if (strcasecmp ("severity", option) == 0)
-    return (set_option_severity (n, value));
-  else if (strcasecmp ("time", option) == 0)
-    return (set_option_time (n, value));
-  else if (strcasecmp ("message", option) == 0)
-    sstrncpy (n->message, value, sizeof (n->message));
-  else if (strcasecmp ("host", option) == 0)
-    sstrncpy (n->host, value, sizeof (n->host));
-  else if (strcasecmp ("plugin", option) == 0)
-    sstrncpy (n->plugin, value, sizeof (n->plugin));
-  else if (strcasecmp ("plugin_instance", option) == 0)
-    sstrncpy (n->plugin_instance, value, sizeof (n->plugin_instance));
-  else if (strcasecmp ("type", option) == 0)
-    sstrncpy (n->type, value, sizeof (n->type));
-  else if (strcasecmp ("type_instance", option) == 0)
-    sstrncpy (n->type_instance, value, sizeof (n->type_instance));
+  if (strcasecmp("severity", option) == 0)
+    return set_option_severity(n, value);
+  else if (strcasecmp("time", option) == 0)
+    return set_option_time(n, value);
+  else if (strcasecmp("message", option) == 0)
+    sstrncpy(n->message, value, sizeof(n->message));
+  else if (strcasecmp("host", option) == 0)
+    sstrncpy(n->host, value, sizeof(n->host));
+  else if (strcasecmp("plugin", option) == 0)
+    sstrncpy(n->plugin, value, sizeof(n->plugin));
+  else if (strcasecmp("plugin_instance", option) == 0)
+    sstrncpy(n->plugin_instance, value, sizeof(n->plugin_instance));
+  else if (strcasecmp("type", option) == 0)
+    sstrncpy(n->type, value, sizeof(n->type));
+  else if (strcasecmp("type_instance", option) == 0)
+    sstrncpy(n->type_instance, value, sizeof(n->type_instance));
   else
-    return (1);
+    return 1;
 
-  return (0);
+  return 0;
 } /* int set_option */
 
-int handle_putnotif (FILE *fh, char *buffer)
-{
+int handle_putnotif(FILE *fh, char *buffer) {
   char *command;
-  notification_t n = { 0 };
+  notification_t n = {0};
   int status;
 
   if ((fh == NULL) || (buffer == NULL))
-    return (-1);
+    return -1;
 
-  DEBUG ("utils_cmd_putnotif: handle_putnotif (fh = %p, buffer = %s);",
-      (void *) fh, buffer);
+  DEBUG("utils_cmd_putnotif: handle_putnotif (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");
-    return (-1);
+  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 ("PUTNOTIF", command) != 0)
-  {
-    print_to_socket (fh, "-1 Unexpected command: `%s'.\n", command);
-    return (-1);
+  if (strcasecmp("PUTNOTIF", command) != 0) {
+    print_to_socket(fh, "-1 Unexpected command: `%s'.\n", command);
+    return -1;
   }
 
   status = 0;
-  while (*buffer != 0)
-  {
+  while (*buffer != 0) {
     char *key;
     char *value;
 
-    status = parse_option (&buffer, &key, &value);
-    if (status != 0)
-    {
-      print_to_socket (fh, "-1 Malformed option.\n");
+    status = parse_option(&buffer, &key, &value);
+    if (status != 0) {
+      print_to_socket(fh, "-1 Malformed option.\n");
       break;
     }
 
-    status = set_option (&n, key, value);
-    if (status != 0)
-    {
-      print_to_socket (fh, "-1 Error parsing option `%s'\n", key);
+    status = set_option(&n, key, value);
+    if (status != 0) {
+      print_to_socket(fh, "-1 Error parsing option `%s'\n", key);
       break;
     }
   } /* for (i) */
 
   /* Check for required fields and complain if anything is missing. */
-  if ((status == 0) && (n.severity == 0))
-  {
-    print_to_socket (fh, "-1 Option `severity' missing.\n");
+  if ((status == 0) && (n.severity == 0)) {
+    print_to_socket(fh, "-1 Option `severity' missing.\n");
     status = -1;
   }
-  if ((status == 0) && (n.time == 0))
-  {
-    print_to_socket (fh, "-1 Option `time' missing.\n");
+  if ((status == 0) && (n.time == 0)) {
+    print_to_socket(fh, "-1 Option `time' missing.\n");
     status = -1;
   }
-  if ((status == 0) && (strlen (n.message) == 0))
-  {
-    print_to_socket (fh, "-1 No message or message of length 0 given.\n");
+  if ((status == 0) && (strlen(n.message) == 0)) {
+    print_to_socket(fh, "-1 No message or message of length 0 given.\n");
     status = -1;
   }
 
   /* If status is still zero the notification is fine and we can finally
    * dispatch it. */
-  if (status == 0)
-  {
-    plugin_dispatch_notification (&n);
-    print_to_socket (fh, "0 Success\n");
+  if (status == 0) {
+    plugin_dispatch_notification(&n);
+    print_to_socket(fh, "0 Success\n");
   }
 
-  return (0);
+  return 0;
 } /* int handle_putnotif */
-
-/* vim: set shiftwidth=2 softtabstop=2 tabstop=8 : */