Merge branch 'collectd-5.7' into collectd-5.8

[collectd.git] / src / tokyotyrant.c

diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index 154215f..1534f51 100644 (file)
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -21,8 +21,8 @@
 
 #include "collectd.h"
 
-#include "plugin.h"
 #include "common.h"
+#include "plugin.h"
 #include "utils_cache.h"
 
 #include <tcrdb.h>
@@ -30,148 +30,123 @@
 #define DEFAULT_HOST "127.0.0.1"
 #define DEFAULT_PORT 1978
 
-static const char *config_keys[] =
-{
-       "Host",
-       "Port"
-};
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+static const char *config_keys[] = {"Host", "Port"};
+static int config_keys_num = STATIC_ARRAY_SIZE(config_keys);
 
 static char *config_host = NULL;
 static char *config_port = NULL;
 
 static TCRDB *rdb = NULL;
 
-static int tt_config (const char *key, const char *value)
-{
-       if (strcasecmp ("Host", key) == 0)
-       {
-               char *temp;
-
-               temp = strdup (value);
-               if (temp == NULL)
-               {
-                       ERROR("tokyotyrant plugin: Host strdup failed.");
-                       return (1);
-               }
-               sfree (config_host);
-               config_host = temp;
-       }
-       else if (strcasecmp ("Port", key) == 0)
-       {
-               char *temp;
-
-               temp = strdup (value);
-               if (temp == NULL)
-               {
-                       ERROR("tokyotyrant plugin: Port strdup failed.");
-                       return (1);
-               }
-               sfree (config_port);
-               config_port = temp;
-       }
-       else
-       {
-               ERROR ("tokyotyrant plugin: error: unrecognized configuration key %s", key);
-               return (-1);
-       }
-
-       return (0);
+static int tt_config(const char *key, const char *value) {
+  if (strcasecmp("Host", key) == 0) {
+    char *temp;
+
+    temp = strdup(value);
+    if (temp == NULL) {
+      ERROR("tokyotyrant plugin: Host strdup failed.");
+      return 1;
+    }
+    sfree(config_host);
+    config_host = temp;
+  } else if (strcasecmp("Port", key) == 0) {
+    char *temp;
+
+    temp = strdup(value);
+    if (temp == NULL) {
+      ERROR("tokyotyrant plugin: Port strdup failed.");
+      return 1;
+    }
+    sfree(config_port);
+    config_port = temp;
+  } else {
+    ERROR("tokyotyrant plugin: error: unrecognized configuration key %s", key);
+    return -1;
+  }
+
+  return 0;
 }
 
-static void printerr (void)
-{
-       int ecode = tcrdbecode(rdb);
-       ERROR ("tokyotyrant plugin: error: %d, %s",
-                       ecode, tcrdberrmsg(ecode));
+static void printerr(void) {
+  int ecode = tcrdbecode(rdb);
+  ERROR("tokyotyrant plugin: error: %d, %s", ecode, tcrdberrmsg(ecode));
 }
 
-static void tt_submit (gauge_t value, const char* type)
-{
-       value_list_t vl = VALUE_LIST_INIT;
+static void tt_submit(gauge_t value, const char *type) {
+  value_list_t vl = VALUE_LIST_INIT;
 
-       vl.values = &(value_t) { .gauge = value };
-       vl.values_len = 1;
+  vl.values = &(value_t){.gauge = value};
+  vl.values_len = 1;
 
-       sstrncpy (vl.host, config_host, sizeof (vl.host));
-       sstrncpy (vl.plugin, "tokyotyrant", sizeof (vl.plugin));
-       sstrncpy (vl.plugin_instance, config_port,
-                       sizeof (vl.plugin_instance));
-       sstrncpy (vl.type, type, sizeof (vl.type));
+  sstrncpy(vl.host, config_host, sizeof(vl.host));
+  sstrncpy(vl.plugin, "tokyotyrant", sizeof(vl.plugin));
+  sstrncpy(vl.plugin_instance, config_port, sizeof(vl.plugin_instance));
+  sstrncpy(vl.type, type, sizeof(vl.type));
 
-       plugin_dispatch_values (&vl);
+  plugin_dispatch_values(&vl);
 }
 
-static void tt_open_db (void)
-{
-       const char *host;
-       int         port = DEFAULT_PORT;
-
-       if (rdb != NULL)
-               return;
-
-       host = ((config_host != NULL) ? config_host : DEFAULT_HOST);
-
-       if (config_port != NULL)
-       {
-               port = service_name_to_port_number (config_port);
-               if (port <= 0)
-                       return;
-       }
-
-       rdb = tcrdbnew ();
-       if (rdb == NULL)
-               return;
-       else if (!tcrdbopen(rdb, host, port))
-       {
-               printerr ();
-               tcrdbdel (rdb);
-               rdb = NULL;
-       }
+static void tt_open_db(void) {
+  const char *host;
+  int port = DEFAULT_PORT;
+
+  if (rdb != NULL)
+    return;
+
+  host = ((config_host != NULL) ? config_host : DEFAULT_HOST);
+
+  if (config_port != NULL) {
+    port = service_name_to_port_number(config_port);
+    if (port <= 0)
+      return;
+  }
+
+  rdb = tcrdbnew();
+  if (rdb == NULL)
+    return;
+  else if (!tcrdbopen(rdb, host, port)) {
+    printerr();
+    tcrdbdel(rdb);
+    rdb = NULL;
+  }
 } /* void tt_open_db */
 
-static int tt_read (void) {
-       gauge_t rnum, size;
+static int tt_read(void) {
+  gauge_t rnum, size;
 
-       tt_open_db ();
-       if (rdb == NULL)
-               return (-1);
+  tt_open_db();
+  if (rdb == NULL)
+    return -1;
 
-       rnum = tcrdbrnum(rdb);
-       tt_submit (rnum, "records");
+  rnum = tcrdbrnum(rdb);
+  tt_submit(rnum, "records");
 
-       size = tcrdbsize(rdb);
-       tt_submit (size, "file_size");
+  size = tcrdbsize(rdb);
+  tt_submit(size, "file_size");
 
-       return (0);
+  return 0;
 }
 
-static int tt_shutdown(void)
-{
-       sfree(config_host);
-       sfree(config_port);
-
-       if (rdb != NULL)
-       {
-               if (!tcrdbclose(rdb))
-               {
-                       printerr ();
-                       tcrdbdel (rdb);
-                       return (1);
-               }
-               tcrdbdel (rdb);
-               rdb = NULL;
-       }
-
-       return(0);
+static int tt_shutdown(void) {
+  sfree(config_host);
+  sfree(config_port);
+
+  if (rdb != NULL) {
+    if (!tcrdbclose(rdb)) {
+      printerr();
+      tcrdbdel(rdb);
+      return 1;
+    }
+    tcrdbdel(rdb);
+    rdb = NULL;
+  }
+
+  return 0;
 }
 
-void module_register (void)
-{
-       plugin_register_config("tokyotyrant", tt_config,
-                       config_keys, config_keys_num);
-       plugin_register_read("tokyotyrant", tt_read);
-       plugin_register_shutdown("tokyotyrant", tt_shutdown);
+void module_register(void) {
+  plugin_register_config("tokyotyrant", tt_config, config_keys,
+                         config_keys_num);
+  plugin_register_read("tokyotyrant", tt_read);
+  plugin_register_shutdown("tokyotyrant", tt_shutdown);
 }
-
-/* vim: set sw=8 ts=8 tw=78 : */