X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils_cmd_flush.c;h=8eec975bda2e84971e0501b84c37ae05f226edb4;hb=79963d13c1884d1d92667cc502ad20758b084a12;hp=410616640bd00ae5e1d2ebe9aa502e3af111e6ea;hpb=b76f88c5bafa82e3c939eb65c13acd431e07cc01;p=collectd.git

diff --git a/src/utils_cmd_flush.c b/src/utils_cmd_flush.c
index 41061664..8eec975b 100644
--- a/src/utils_cmd_flush.c
+++ b/src/utils_cmd_flush.c
@@ -27,135 +27,118 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "utils_parse_option.h"
 #include "utils_cmd_flush.h"
+#include "utils_parse_option.h"
 
-int handle_flush (FILE *fh, char *buffer)
-{
-	int success = 0;
-	int error   = 0;
-
-	double timeout = 0.0;
-	char **plugins = NULL;
-	size_t plugins_num = 0;
-	char **identifiers = NULL;
-	size_t identifiers_num = 0;
-
-	size_t i;
-
-#define PRINT_TO_SOCK(fh, ...) \
-	do { \
-		if (fprintf (fh, __VA_ARGS__) < 0) { \
-			char errbuf[1024]; \
-			WARNING ("handle_flush: failed to write to socket #%i: %s", \
-					fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \
-			strarray_free (plugins, plugins_num); \
-			strarray_free (identifiers, identifiers_num); \
-			return -1; \
-		} \
-		fflush(fh); \
-	} while (0)
-
-	if ((fh == NULL) || (buffer == NULL))
-		return (-1);
-
-	DEBUG ("utils_cmd_flush: handle_flush (fh = %p, buffer = %s);",
-			(void *) fh, buffer);
-
-	if (strncasecmp ("FLUSH", buffer, strlen ("FLUSH")) != 0)
-	{
-		PRINT_TO_SOCK (fh, "-1 Cannot parse command.\n");
-		return (-1);
-	}
-	buffer += strlen ("FLUSH");
-
-	while (*buffer != 0)
-	{
-		char *opt_key;
-		char *opt_value;
-		int status;
-
-		opt_key = NULL;
-		opt_value = NULL;
-		status = parse_option (&buffer, &opt_key, &opt_value);
-		if (status != 0)
-		{
-			PRINT_TO_SOCK (fh, "-1 Parsing options failed.\n");
-			strarray_free (plugins, plugins_num);
-			strarray_free (identifiers, identifiers_num);
-			return (-1);
-		}
-
-		if (strcasecmp ("plugin", opt_key) == 0)
-			strarray_add (&plugins, &plugins_num, opt_value);
-		else if (strcasecmp ("identifier", opt_key) == 0)
-			strarray_add (&identifiers, &identifiers_num, opt_value);
-		else if (strcasecmp ("timeout", opt_key) == 0)
-		{
-			char *endptr;
-
-			errno = 0;
-			endptr = NULL;
-			timeout = strtod (opt_value, &endptr);
-
-			if ((endptr == opt_value) || (errno != 0) || (!isfinite (timeout)))
-			{
-				PRINT_TO_SOCK (fh, "-1 Invalid value for option `timeout': "
-						"%s\n", opt_value);
-				strarray_free (plugins, plugins_num);
-				strarray_free (identifiers, identifiers_num);
-				return (-1);
-			}
-			else if (timeout < 0.0)
-			{
-				timeout = 0.0;
-			}
-		}
-		else
-		{
-			PRINT_TO_SOCK (fh, "-1 Cannot parse option %s\n", opt_key);
-			strarray_free (plugins, plugins_num);
-			strarray_free (identifiers, identifiers_num);
-			return (-1);
-		}
-	} /* while (*buffer != 0) */
-
-	for (i = 0; (i == 0) || (i < plugins_num); i++)
-	{
-		char *plugin = NULL;
-		size_t j;
-
-		if (plugins_num != 0)
-			plugin = plugins[i];
-
-		for (j = 0; (j == 0) || (j < identifiers_num); j++)
-		{
-			char *identifier = NULL;
-			int status;
-
-			if (identifiers_num != 0)
-				identifier = identifiers[j];
-
-			status = plugin_flush (plugin,
-					DOUBLE_TO_CDTIME_T (timeout),
-					identifier);
-			if (status == 0)
-				success++;
-			else
-				error++;
-		}
-	}
-
-	PRINT_TO_SOCK (fh, "0 Done: %i successful, %i errors\n",
-			success, error);
-
-	strarray_free (plugins, plugins_num);
-	strarray_free (identifiers, identifiers_num);
-	return (0);
+int handle_flush(FILE *fh, char *buffer) {
+  int success = 0;
+  int error = 0;
+
+  double timeout = 0.0;
+  char **plugins = NULL;
+  size_t plugins_num = 0;
+  char **identifiers = NULL;
+  size_t identifiers_num = 0;
+
+#define PRINT_TO_SOCK(fh, ...)                                                 \
+  do {                                                                         \
+    if (fprintf(fh, __VA_ARGS__) < 0) {                                        \
+      char errbuf[1024];                                                       \
+      WARNING("handle_flush: failed to write to socket #%i: %s", fileno(fh),   \
+              sstrerror(errno, errbuf, sizeof(errbuf)));                       \
+      strarray_free(plugins, plugins_num);                                     \
+      strarray_free(identifiers, identifiers_num);                             \
+      return -1;                                                               \
+    }                                                                          \
+    fflush(fh);                                                                \
+  } while (0)
+
+  if ((fh == NULL) || (buffer == NULL))
+    return (-1);
+
+  DEBUG("utils_cmd_flush: handle_flush (fh = %p, buffer = %s);", (void *)fh,
+        buffer);
+
+  if (strncasecmp("FLUSH", buffer, strlen("FLUSH")) != 0) {
+    PRINT_TO_SOCK(fh, "-1 Cannot parse command.\n");
+    return (-1);
+  }
+  buffer += strlen("FLUSH");
+
+  while (*buffer != 0) {
+    char *opt_key;
+    char *opt_value;
+    int status;
+
+    opt_key = NULL;
+    opt_value = NULL;
+    status = parse_option(&buffer, &opt_key, &opt_value);
+    if (status != 0) {
+      PRINT_TO_SOCK(fh, "-1 Parsing options failed.\n");
+      strarray_free(plugins, plugins_num);
+      strarray_free(identifiers, identifiers_num);
+      return (-1);
+    }
+
+    if (strcasecmp("plugin", opt_key) == 0)
+      strarray_add(&plugins, &plugins_num, opt_value);
+    else if (strcasecmp("identifier", opt_key) == 0)
+      strarray_add(&identifiers, &identifiers_num, opt_value);
+    else if (strcasecmp("timeout", opt_key) == 0) {
+      char *endptr;
+
+      errno = 0;
+      endptr = NULL;
+      timeout = strtod(opt_value, &endptr);
+
+      if ((endptr == opt_value) || (errno != 0) || (!isfinite(timeout))) {
+        PRINT_TO_SOCK(fh, "-1 Invalid value for option `timeout': "
+                          "%s\n",
+                      opt_value);
+        strarray_free(plugins, plugins_num);
+        strarray_free(identifiers, identifiers_num);
+        return (-1);
+      } else if (timeout < 0.0) {
+        timeout = 0.0;
+      }
+    } else {
+      PRINT_TO_SOCK(fh, "-1 Cannot parse option %s\n", opt_key);
+      strarray_free(plugins, plugins_num);
+      strarray_free(identifiers, identifiers_num);
+      return (-1);
+    }
+  } /* while (*buffer != 0) */
+
+  for (size_t i = 0; (i == 0) || (i < plugins_num); i++) {
+    char *plugin = NULL;
+
+    if (plugins_num != 0)
+      plugin = plugins[i];
+
+    for (size_t j = 0; (j == 0) || (j < identifiers_num); j++) {
+      char *identifier = NULL;
+      int status;
+
+      if (identifiers_num != 0)
+        identifier = identifiers[j];
+
+      status = plugin_flush(plugin, DOUBLE_TO_CDTIME_T(timeout), identifier);
+      if (status == 0)
+        success++;
+      else
+        error++;
+    }
+  }
+
+  PRINT_TO_SOCK(fh, "0 Done: %i successful, %i errors\n", success, error);
+
+  strarray_free(plugins, plugins_num);
+  strarray_free(identifiers, identifiers_num);
+  return (0);
 #undef PRINT_TO_SOCK
 } /* int handle_flush */
 
 /* vim: set sw=4 ts=4 tw=78 noexpandtab : */
-