X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdaemon%2Ftypes_list.c;h=89a08dd7f30ff61a45abe650fd2a7c2575654983;hp=34c222c7870dab6f0bb0a96bd3714910435fdae2;hb=1159cb5d383c55a80a0db100b8f7aadcf44740a5;hpb=958f7776a2daaa1a8664aded0a2c1d717c2f5909

diff --git a/src/daemon/types_list.c b/src/daemon/types_list.c
index 34c222c7..89a08dd7 100644
--- a/src/daemon/types_list.c
+++ b/src/daemon/types_list.c
@@ -28,25 +28,22 @@
 
 #include "common.h"
 
-#include "plugin.h"
 #include "configfile.h"
+#include "plugin.h"
 #include "types_list.h"
 
-static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
-{
+static int parse_ds(data_source_t *dsrc, char *buf, size_t buf_len) {
   char *dummy;
   char *saveptr;
   char *fields[8];
-  int   fields_num;
+  int fields_num;
 
-  if (buf_len < 11)
-  {
-    ERROR ("parse_ds: (buf_len = %zu) < 11", buf_len);
-    return (-1);
+  if (buf_len < 11) {
+    ERROR("parse_ds: (buf_len = %zu) < 11", buf_len);
+    return -1;
   }
 
-  if (buf[buf_len - 1] == ',')
-  {
+  if (buf[buf_len - 1] == ',') {
     buf_len--;
     buf[buf_len] = '\0';
   }
@@ -55,56 +52,53 @@ static int parse_ds (data_source_t *dsrc, char *buf, size_t buf_len)
   saveptr = NULL;
 
   fields_num = 0;
-  while (fields_num < 8)
-  {
-    if ((fields[fields_num] = strtok_r (dummy, ":", &saveptr)) == NULL)
+  while (fields_num < 8) {
+    if ((fields[fields_num] = strtok_r(dummy, ":", &saveptr)) == NULL)
       break;
     dummy = NULL;
     fields_num++;
   }
 
-  if (fields_num != 4)
-  {
-    ERROR ("parse_ds: (fields_num = %i) != 4", fields_num);
-    return (-1);
+  if (fields_num != 4) {
+    ERROR("parse_ds: (fields_num = %i) != 4", fields_num);
+    return -1;
   }
 
-  sstrncpy (dsrc->name, fields[0], sizeof (dsrc->name));
+  sstrncpy(dsrc->name, fields[0], sizeof(dsrc->name));
 
-  if (strcasecmp (fields[1], "GAUGE") == 0)
+  if (strcasecmp(fields[1], "GAUGE") == 0)
     dsrc->type = DS_TYPE_GAUGE;
-  else if (strcasecmp (fields[1], "COUNTER") == 0)
+  else if (strcasecmp(fields[1], "COUNTER") == 0)
     dsrc->type = DS_TYPE_COUNTER;
-  else if (strcasecmp (fields[1], "DERIVE") == 0)
+  else if (strcasecmp(fields[1], "DERIVE") == 0)
     dsrc->type = DS_TYPE_DERIVE;
-  else if (strcasecmp (fields[1], "ABSOLUTE") == 0)
+  else if (strcasecmp(fields[1], "ABSOLUTE") == 0)
     dsrc->type = DS_TYPE_ABSOLUTE;
-  else
-  {
-    ERROR ("(fields[1] = %s) != (GAUGE || COUNTER || DERIVE || ABSOLUTE)", fields[1]);
-    return (-1);
+  else {
+    ERROR("(fields[1] = %s) != (GAUGE || COUNTER || DERIVE || ABSOLUTE)",
+          fields[1]);
+    return -1;
   }
 
-  if (strcasecmp (fields[2], "U") == 0)
+  if (strcasecmp(fields[2], "U") == 0)
     dsrc->min = NAN;
   else
-    dsrc->min = atof (fields[2]);
+    dsrc->min = atof(fields[2]);
 
-  if (strcasecmp (fields[3], "U") == 0)
+  if (strcasecmp(fields[3], "U") == 0)
     dsrc->max = NAN;
   else
-    dsrc->max = atof (fields[3]);
+    dsrc->max = atof(fields[3]);
 
-  return (0);
+  return 0;
 } /* int parse_ds */
 
-static void parse_line (char *buf)
-{
-  char  *fields[64];
+static void parse_line(char *buf) {
+  char *fields[64];
   size_t fields_num;
   data_set_t *ds;
 
-  fields_num = strsplit (buf, fields, 64);
+  fields_num = strsplit(buf, fields, 64);
   if (fields_num < 2)
     return;
 
@@ -112,53 +106,48 @@ static void parse_line (char *buf)
   if (fields[0][0] == '#')
     return;
 
-  ds = calloc (1, sizeof (*ds));
+  ds = calloc(1, sizeof(*ds));
   if (ds == NULL)
     return;
 
-  sstrncpy (ds->type, fields[0], sizeof (ds->type));
+  sstrncpy(ds->type, fields[0], sizeof(ds->type));
 
   ds->ds_num = fields_num - 1;
-  ds->ds = (data_source_t *) calloc (ds->ds_num, sizeof (data_source_t));
-  if (ds->ds == NULL)
-  {
-    sfree (ds);
+  ds->ds = (data_source_t *)calloc(ds->ds_num, sizeof(data_source_t));
+  if (ds->ds == NULL) {
+    sfree(ds);
     return;
   }
 
   for (size_t i = 0; i < ds->ds_num; i++)
-    if (parse_ds (ds->ds + i, fields[i + 1], strlen (fields[i + 1])) != 0)
-    {
-      ERROR ("types_list: parse_line: Cannot parse data source #%zu "
-	  "of data set %s", i, ds->type);
-      sfree (ds->ds);
-      sfree (ds);
+    if (parse_ds(ds->ds + i, fields[i + 1], strlen(fields[i + 1])) != 0) {
+      ERROR("types_list: parse_line: Cannot parse data source #%zu "
+            "of data set %s",
+            i, ds->type);
+      sfree(ds->ds);
+      sfree(ds);
       return;
     }
 
-  plugin_register_data_set (ds);
+  plugin_register_data_set(ds);
 
-  sfree (ds->ds);
-  sfree (ds);
+  sfree(ds->ds);
+  sfree(ds);
 } /* void parse_line */
 
-static void parse_file (FILE *fh)
-{
+static void parse_file(FILE *fh) {
   char buf[4096];
   size_t buf_len;
 
-  while (fgets (buf, sizeof (buf), fh) != NULL)
-  {
-    buf_len = strlen (buf);
-
-    if (buf_len >= 4095)
-    {
-      NOTICE ("Skipping line with more than 4095 characters.");
-      do
-      {
-	if (fgets (buf, sizeof (buf), fh) == NULL)
-	  break;
-	buf_len = strlen (buf);
+  while (fgets(buf, sizeof(buf), fh) != NULL) {
+    buf_len = strlen(buf);
+
+    if (buf_len >= 4095) {
+      NOTICE("Skipping line with more than 4095 characters.");
+      do {
+        if (fgets(buf, sizeof(buf), fh) == NULL)
+          break;
+        buf_len = strlen(buf);
       } while (buf_len >= 4095);
       continue;
     } /* if (buf_len >= 4095) */
@@ -166,45 +155,39 @@ static void parse_file (FILE *fh)
     if ((buf_len == 0) || (buf[0] == '#'))
       continue;
 
-    while ((buf_len > 0) && ((buf[buf_len - 1] == '\n')
-	  || (buf[buf_len - 1] == '\r')))
+    while ((buf_len > 0) &&
+           ((buf[buf_len - 1] == '\n') || (buf[buf_len - 1] == '\r')))
       buf[--buf_len] = '\0';
 
     if (buf_len == 0)
       continue;
 
-    parse_line (buf);
+    parse_line(buf);
   } /* while (fgets) */
 } /* void parse_file */
 
-int read_types_list (const char *file)
-{
+int read_types_list(const char *file) {
   FILE *fh;
 
   if (file == NULL)
-    return (-1);
+    return -1;
 
-  fh = fopen (file, "r");
-  if (fh == NULL)
-  {
+  fh = fopen(file, "r");
+  if (fh == NULL) {
     char errbuf[1024];
-    fprintf (stderr, "Failed to open types database `%s': %s.\n",
-	file, sstrerror (errno, errbuf, sizeof (errbuf)));
-    ERROR ("Failed to open types database `%s': %s",
-	file, sstrerror (errno, errbuf, sizeof (errbuf)));
-    return (-1);
+    fprintf(stderr, "Failed to open types database `%s': %s.\n", file,
+            sstrerror(errno, errbuf, sizeof(errbuf)));
+    ERROR("Failed to open types database `%s': %s", file,
+          sstrerror(errno, errbuf, sizeof(errbuf)));
+    return -1;
   }
 
-  parse_file (fh);
+  parse_file(fh);
 
-  fclose (fh);
+  fclose(fh);
   fh = NULL;
 
-  DEBUG ("Done parsing `%s'", file);
+  DEBUG("Done parsing `%s'", file);
 
-  return (0);
+  return 0;
 } /* int read_types_list */
-
-/*
- * vim: shiftwidth=2:softtabstop=2:tabstop=8
- */