X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fdbi.c;h=7cab1d54e9c565addc07900e376ff3ee4b28eb68;hp=fefbf87bcab0a4a101e6bd2a1f899a37394d3052;hb=936c450a86c841eea89888c8550c9118fae90c25;hpb=77ad300d75ce59bf4d49d839a2af72e90590033c

diff --git a/src/dbi.c b/src/dbi.c
index fefbf87b..7cab1d54 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -36,12 +36,12 @@
  * functions "deprecated". These macros convert the new functions to their old
  * counterparts for backwards compatibility. */
 #if !defined(LIBDBI_VERSION) || (LIBDBI_VERSION < 900)
-# define HAVE_LEGACY_LIBDBI 1
-# define dbi_initialize_r(a,inst) dbi_initialize(a)
-# define dbi_shutdown_r(inst) dbi_shutdown()
-# define dbi_set_verbosity_r(a,inst) dbi_set_verbosity(a)
-# define dbi_driver_list_r(a,inst) dbi_driver_list(a)
-# define dbi_driver_open_r(a,inst) dbi_driver_open(a)
+#define HAVE_LEGACY_LIBDBI 1
+#define dbi_initialize_r(a, inst) dbi_initialize(a)
+#define dbi_shutdown_r(inst) dbi_shutdown()
+#define dbi_set_verbosity_r(a, inst) dbi_set_verbosity(a)
+#define dbi_driver_list_r(a, inst) dbi_driver_list(a)
+#define dbi_driver_open_r(a, inst) dbi_driver_open(a)
 #endif
 
 /*
@@ -50,8 +50,7 @@
 struct cdbi_driver_option_s /* {{{ */
 {
   char *key;
-  union
-  {
+  union {
     char *string;
     int numeric;
   } value;
@@ -73,7 +72,7 @@ struct cdbi_database_s /* {{{ */
 
   udb_query_preparation_area_t **q_prep_areas;
   udb_query_t **queries;
-  size_t        queries_num;
+  size_t queries_num;
 
   dbi_conn connection;
 };
@@ -83,121 +82,111 @@ typedef struct cdbi_database_s cdbi_database_t; /* }}} */
  * Global variables
  */
 #if !defined(HAVE_LEGACY_LIBDBI) || !HAVE_LEGACY_LIBDBI
-static dbi_inst          dbi_instance  = 0;
+static dbi_inst dbi_instance = 0;
 #endif
-static udb_query_t     **queries       = NULL;
-static size_t            queries_num   = 0;
-static cdbi_database_t **databases     = NULL;
-static size_t            databases_num = 0;
+static udb_query_t **queries = NULL;
+static size_t queries_num = 0;
+static cdbi_database_t **databases = NULL;
+static size_t databases_num = 0;
 
-static int cdbi_read_database (user_data_t *ud);
+static int cdbi_read_database(user_data_t *ud);
 
 /*
  * Functions
  */
-static const char *cdbi_strerror (dbi_conn conn, /* {{{ */
-    char *buffer, size_t buffer_size)
-{
+static const char *cdbi_strerror(dbi_conn conn, /* {{{ */
+                                 char *buffer, size_t buffer_size) {
   const char *msg;
   int status;
 
-  if (conn == NULL)
-  {
-    sstrncpy (buffer, "connection is NULL", buffer_size);
+  if (conn == NULL) {
+    sstrncpy(buffer, "connection is NULL", buffer_size);
     return (buffer);
   }
 
   msg = NULL;
-  status = dbi_conn_error (conn, &msg);
+  status = dbi_conn_error(conn, &msg);
   if ((status >= 0) && (msg != NULL))
-    ssnprintf (buffer, buffer_size, "%s (status %i)", msg, status);
+    ssnprintf(buffer, buffer_size, "%s (status %i)", msg, status);
   else
-    ssnprintf (buffer, buffer_size, "dbi_conn_error failed with status %i",
-        status);
+    ssnprintf(buffer, buffer_size, "dbi_conn_error failed with status %i",
+              status);
 
   return (buffer);
 } /* }}} const char *cdbi_conn_error */
 
-static int cdbi_result_get_field (dbi_result res, /* {{{ */
-    unsigned int index, char *buffer, size_t buffer_size)
-{
+static int cdbi_result_get_field(dbi_result res, /* {{{ */
+                                 unsigned int index, char *buffer,
+                                 size_t buffer_size) {
   unsigned short src_type;
 
-  src_type = dbi_result_get_field_type_idx (res, index);
-  if (src_type == DBI_TYPE_ERROR)
-  {
-    ERROR ("dbi plugin: cdbi_result_get: "
-        "dbi_result_get_field_type_idx failed.");
+  src_type = dbi_result_get_field_type_idx(res, index);
+  if (src_type == DBI_TYPE_ERROR) {
+    ERROR("dbi plugin: cdbi_result_get: "
+          "dbi_result_get_field_type_idx failed.");
     return (-1);
   }
 
-  if (src_type == DBI_TYPE_INTEGER)
-  {
+  if (src_type == DBI_TYPE_INTEGER) {
     long long value;
 
-    value = dbi_result_get_longlong_idx (res, index);
-    ssnprintf (buffer, buffer_size, "%lli", value);
-  }
-  else if (src_type == DBI_TYPE_DECIMAL)
-  {
+    value = dbi_result_get_longlong_idx(res, index);
+    ssnprintf(buffer, buffer_size, "%lli", value);
+  } else if (src_type == DBI_TYPE_DECIMAL) {
     double value;
 
-    value = dbi_result_get_double_idx (res, index);
-    ssnprintf (buffer, buffer_size, "%63.15g", value);
-  }
-  else if (src_type == DBI_TYPE_STRING)
-  {
+    value = dbi_result_get_double_idx(res, index);
+    ssnprintf(buffer, buffer_size, "%63.15g", value);
+  } else if (src_type == DBI_TYPE_STRING) {
     const char *value;
 
-    value = dbi_result_get_string_idx (res, index);
+    value = dbi_result_get_string_idx(res, index);
     if (value == NULL)
-      sstrncpy (buffer, "", buffer_size);
-    else if (strcmp ("ERROR", value) == 0)
+      sstrncpy(buffer, "", buffer_size);
+    else if (strcmp("ERROR", value) == 0)
       return (-1);
     else
-      sstrncpy (buffer, value, buffer_size);
+      sstrncpy(buffer, value, buffer_size);
   }
   /* DBI_TYPE_BINARY */
   /* DBI_TYPE_DATETIME */
-  else
-  {
+  else {
     const char *field_name;
 
-    field_name = dbi_result_get_field_name (res, index);
+    field_name = dbi_result_get_field_name(res, index);
     if (field_name == NULL)
       field_name = "<unknown>";
 
-    ERROR ("dbi plugin: Column `%s': Don't know how to handle "
-        "source type %hu.",
-        field_name, src_type);
+    ERROR("dbi plugin: Column `%s': Don't know how to handle "
+          "source type %hu.",
+          field_name, src_type);
     return (-1);
   }
 
   return (0);
 } /* }}} int cdbi_result_get_field */
 
-static void cdbi_database_free (cdbi_database_t *db) /* {{{ */
+static void cdbi_database_free(cdbi_database_t *db) /* {{{ */
 {
   if (db == NULL)
     return;
 
-  sfree (db->name);
-  sfree (db->driver);
+  sfree(db->name);
+  sfree(db->driver);
 
-  for (size_t i = 0; i < db->driver_options_num; i++)
-  {
-    sfree (db->driver_options[i].key);
+  for (size_t i = 0; i < db->driver_options_num; i++) {
+    sfree(db->driver_options[i].key);
     if (!db->driver_options[i].is_numeric)
-      sfree (db->driver_options[i].value.string);
+      sfree(db->driver_options[i].value.string);
   }
-  sfree (db->driver_options);
+  sfree(db->driver_options);
 
   if (db->q_prep_areas)
     for (size_t i = 0; i < db->queries_num; ++i)
-      udb_query_delete_preparation_area (db->q_prep_areas[i]);
-  free (db->q_prep_areas);
+      udb_query_delete_preparation_area(db->q_prep_areas[i]);
+  free(db->q_prep_areas);
 
-  sfree (db);
+  sfree(db);
 } /* }}} void cdbi_database_free */
 
 /* Configuration handling functions {{{
@@ -223,54 +212,45 @@ static void cdbi_database_free (cdbi_database_t *db) /* {{{ */
  * </Plugin>
  */
 
-static int cdbi_config_add_database_driver_option (cdbi_database_t *db, /* {{{ */
-    oconfig_item_t *ci)
-{
+static int cdbi_config_add_database_driver_option(cdbi_database_t *db, /* {{{ */
+                                                  oconfig_item_t *ci) {
   cdbi_driver_option_t *option;
 
-  if ((ci->values_num != 2)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING)
-      || ((ci->values[1].type != OCONFIG_TYPE_STRING)
-        && (ci->values[1].type != OCONFIG_TYPE_NUMBER)))
-  {
-    WARNING ("dbi plugin: The `DriverOption' config option "
-        "needs exactly two arguments.");
+  if ((ci->values_num != 2) || (ci->values[0].type != OCONFIG_TYPE_STRING) ||
+      ((ci->values[1].type != OCONFIG_TYPE_STRING) &&
+       (ci->values[1].type != OCONFIG_TYPE_NUMBER))) {
+    WARNING("dbi plugin: The `DriverOption' config option "
+            "needs exactly two arguments.");
     return (-1);
   }
 
-  option = realloc (db->driver_options,
-      sizeof (*option) * (db->driver_options_num + 1));
-  if (option == NULL)
-  {
-    ERROR ("dbi plugin: realloc failed");
+  option = realloc(db->driver_options,
+                   sizeof(*option) * (db->driver_options_num + 1));
+  if (option == NULL) {
+    ERROR("dbi plugin: realloc failed");
     return (-1);
   }
 
   db->driver_options = option;
   option = db->driver_options + db->driver_options_num;
-  memset (option, 0, sizeof (*option));
+  memset(option, 0, sizeof(*option));
 
-  option->key = strdup (ci->values[0].value.string);
-  if (option->key == NULL)
-  {
-    ERROR ("dbi plugin: strdup failed.");
+  option->key = strdup(ci->values[0].value.string);
+  if (option->key == NULL) {
+    ERROR("dbi plugin: strdup failed.");
     return (-1);
   }
 
-  if (ci->values[1].type == OCONFIG_TYPE_STRING)
-  {
-    option->value.string = strdup (ci->values[1].value.string);
-    if (option->value.string == NULL)
-    {
-      ERROR ("dbi plugin: strdup failed.");
-      sfree (option->key);
+  if (ci->values[1].type == OCONFIG_TYPE_STRING) {
+    option->value.string = strdup(ci->values[1].value.string);
+    if (option->value.string == NULL) {
+      ERROR("dbi plugin: strdup failed.");
+      sfree(option->key);
       return (-1);
     }
-  }
-  else
-  {
-    assert (ci->values[1].type == OCONFIG_TYPE_NUMBER);
-    option->value.numeric = (int) (ci->values[1].value.number + .5);
+  } else {
+    assert(ci->values[1].type == OCONFIG_TYPE_NUMBER);
+    option->value.numeric = (int)(ci->values[1].value.number + .5);
     option->is_numeric = 1;
   }
 
@@ -278,54 +258,48 @@ static int cdbi_config_add_database_driver_option (cdbi_database_t *db, /* {{{ *
   return (0);
 } /* }}} int cdbi_config_add_database_driver_option */
 
-static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */
+static int cdbi_config_add_database(oconfig_item_t *ci) /* {{{ */
 {
   cdbi_database_t *db;
   int status;
 
-  if ((ci->values_num != 1)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING))
-  {
-    WARNING ("dbi plugin: The `Database' block "
-        "needs exactly one string argument.");
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) {
+    WARNING("dbi plugin: The `Database' block "
+            "needs exactly one string argument.");
     return (-1);
   }
 
-  db = calloc (1, sizeof (*db));
-  if (db == NULL)
-  {
-    ERROR ("dbi plugin: calloc failed.");
+  db = calloc(1, sizeof(*db));
+  if (db == NULL) {
+    ERROR("dbi plugin: calloc failed.");
     return (-1);
   }
 
-  status = cf_util_get_string (ci, &db->name);
-  if (status != 0)
-  {
-    sfree (db);
+  status = cf_util_get_string(ci, &db->name);
+  if (status != 0) {
+    sfree(db);
     return (status);
   }
 
   /* Fill the `cdbi_database_t' structure.. */
-  for (int i = 0; i < ci->children_num; i++)
-  {
+  for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *child = ci->children + i;
 
-    if (strcasecmp ("Driver", child->key) == 0)
-      status = cf_util_get_string (child, &db->driver);
-    else if (strcasecmp ("DriverOption", child->key) == 0)
-      status = cdbi_config_add_database_driver_option (db, child);
-    else if (strcasecmp ("SelectDB", child->key) == 0)
-      status = cf_util_get_string (child, &db->select_db);
-    else if (strcasecmp ("Query", child->key) == 0)
-      status = udb_query_pick_from_list (child, queries, queries_num,
-          &db->queries, &db->queries_num);
-    else if (strcasecmp ("Host", child->key) == 0)
-      status = cf_util_get_string (child, &db->host);
-    else if (strcasecmp ("Interval", child->key) == 0)
+    if (strcasecmp("Driver", child->key) == 0)
+      status = cf_util_get_string(child, &db->driver);
+    else if (strcasecmp("DriverOption", child->key) == 0)
+      status = cdbi_config_add_database_driver_option(db, child);
+    else if (strcasecmp("SelectDB", child->key) == 0)
+      status = cf_util_get_string(child, &db->select_db);
+    else if (strcasecmp("Query", child->key) == 0)
+      status = udb_query_pick_from_list(child, queries, queries_num,
+                                        &db->queries, &db->queries_num);
+    else if (strcasecmp("Host", child->key) == 0)
+      status = cf_util_get_string(child, &db->host);
+    else if (strcasecmp("Interval", child->key) == 0)
       status = cf_util_get_cdtime(child, &db->interval);
-    else
-    {
-      WARNING ("dbi plugin: Option `%s' not allowed here.", child->key);
+    else {
+      WARNING("dbi plugin: Option `%s' not allowed here.", child->key);
       status = -1;
     }
 
@@ -334,40 +308,33 @@ static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */
   }
 
   /* Check that all necessary options have been given. */
-  while (status == 0)
-  {
-    if (db->driver == NULL)
-    {
-      WARNING ("dbi plugin: `Driver' not given for database `%s'", db->name);
+  while (status == 0) {
+    if (db->driver == NULL) {
+      WARNING("dbi plugin: `Driver' not given for database `%s'", db->name);
       status = -1;
     }
-    if (db->driver_options_num == 0)
-    {
-      WARNING ("dbi plugin: No `DriverOption' given for database `%s'. "
-          "This will likely not work.", db->name);
+    if (db->driver_options_num == 0) {
+      WARNING("dbi plugin: No `DriverOption' given for database `%s'. "
+              "This will likely not work.",
+              db->name);
     }
 
     break;
   } /* while (status == 0) */
 
-  while ((status == 0) && (db->queries_num > 0))
-  {
-    db->q_prep_areas = calloc (db->queries_num, sizeof (*db->q_prep_areas));
-    if (db->q_prep_areas == NULL)
-    {
-      WARNING ("dbi plugin: calloc failed");
+  while ((status == 0) && (db->queries_num > 0)) {
+    db->q_prep_areas = calloc(db->queries_num, sizeof(*db->q_prep_areas));
+    if (db->q_prep_areas == NULL) {
+      WARNING("dbi plugin: calloc failed");
       status = -1;
       break;
     }
 
-    for (size_t i = 0; i < db->queries_num; ++i)
-    {
-      db->q_prep_areas[i]
-        = udb_query_allocate_preparation_area (db->queries[i]);
+    for (size_t i = 0; i < db->queries_num; ++i) {
+      db->q_prep_areas[i] = udb_query_allocate_preparation_area(db->queries[i]);
 
-      if (db->q_prep_areas[i] == NULL)
-      {
-        WARNING ("dbi plugin: udb_query_allocate_preparation_area failed");
+      if (db->q_prep_areas[i] == NULL) {
+        WARNING("dbi plugin: udb_query_allocate_preparation_area failed");
         status = -1;
         break;
       }
@@ -377,57 +344,50 @@ static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */
   }
 
   /* If all went well, add this database to the global list of databases. */
-  if (status == 0)
-  {
+  if (status == 0) {
     cdbi_database_t **temp;
 
-    temp = realloc (databases,
-        sizeof (*databases) * (databases_num + 1));
-    if (temp == NULL)
-    {
-      ERROR ("dbi plugin: realloc failed");
+    temp = realloc(databases, sizeof(*databases) * (databases_num + 1));
+    if (temp == NULL) {
+      ERROR("dbi plugin: realloc failed");
       status = -1;
-    }
-    else
-    {
+    } else {
       databases = temp;
       databases[databases_num] = db;
       databases_num++;
 
       char *name = ssnprintf_alloc("dbi:%s", db->name);
-      plugin_register_complex_read (/* group = */ NULL,
+      plugin_register_complex_read(
+          /* group = */ NULL,
           /* name = */ name ? name : db->name,
           /* callback = */ cdbi_read_database,
           /* interval = */ (db->interval > 0) ? db->interval : 0,
-          &(user_data_t) {
-            .data = db,
-	  });
-      sfree (name);
+          &(user_data_t){
+              .data = db,
+          });
+      sfree(name);
     }
   }
 
-  if (status != 0)
-  {
-    cdbi_database_free (db);
+  if (status != 0) {
+    cdbi_database_free(db);
     return (-1);
   }
 
   return (0);
 } /* }}} int cdbi_config_add_database */
 
-static int cdbi_config (oconfig_item_t *ci) /* {{{ */
+static int cdbi_config(oconfig_item_t *ci) /* {{{ */
 {
-  for (int i = 0; i < ci->children_num; i++)
-  {
+  for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *child = ci->children + i;
-    if (strcasecmp ("Query", child->key) == 0)
-      udb_query_create (&queries, &queries_num, child,
-          /* callback = */ NULL);
-    else if (strcasecmp ("Database", child->key) == 0)
-      cdbi_config_add_database (child);
-    else
-    {
-      WARNING ("dbi plugin: Ignoring unknown config option `%s'.", child->key);
+    if (strcasecmp("Query", child->key) == 0)
+      udb_query_create(&queries, &queries_num, child,
+                       /* callback = */ NULL);
+    else if (strcasecmp("Database", child->key) == 0)
+      cdbi_config_add_database(child);
+    else {
+      WARNING("dbi plugin: Ignoring unknown config option `%s'.", child->key);
     }
   } /* for (ci->children) */
 
@@ -436,7 +396,7 @@ static int cdbi_config (oconfig_item_t *ci) /* {{{ */
 
 /* }}} End of configuration handling functions */
 
-static int cdbi_init (void) /* {{{ */
+static int cdbi_init(void) /* {{{ */
 {
   static int did_init = 0;
   int status;
@@ -444,42 +404,37 @@ static int cdbi_init (void) /* {{{ */
   if (did_init != 0)
     return (0);
 
-  if (queries_num == 0)
-  {
-    ERROR ("dbi plugin: No <Query> blocks have been found. Without them, "
-        "this plugin can't do anything useful, so we will return an error.");
+  if (queries_num == 0) {
+    ERROR("dbi plugin: No <Query> blocks have been found. Without them, "
+          "this plugin can't do anything useful, so we will return an error.");
     return (-1);
   }
 
-  if (databases_num == 0)
-  {
-    ERROR ("dbi plugin: No <Database> blocks have been found. Without them, "
-        "this plugin can't do anything useful, so we will return an error.");
+  if (databases_num == 0) {
+    ERROR("dbi plugin: No <Database> blocks have been found. Without them, "
+          "this plugin can't do anything useful, so we will return an error.");
     return (-1);
   }
 
-  status = dbi_initialize_r (/* driverdir = */ NULL, &dbi_instance);
-  if (status < 0)
-  {
-    ERROR ("dbi plugin: cdbi_init: dbi_initialize_r failed with status %i.",
-        status);
+  status = dbi_initialize_r(/* driverdir = */ NULL, &dbi_instance);
+  if (status < 0) {
+    ERROR("dbi plugin: cdbi_init: dbi_initialize_r failed with status %i.",
+          status);
     return (-1);
-  }
-  else if (status == 0)
-  {
-    ERROR ("dbi plugin: `dbi_initialize_r' could not load any drivers. Please "
-        "install at least one `DBD' or check your installation.");
+  } else if (status == 0) {
+    ERROR("dbi plugin: `dbi_initialize_r' could not load any drivers. Please "
+          "install at least one `DBD' or check your installation.");
     return (-1);
   }
-  DEBUG ("dbi plugin: cdbi_init: dbi_initialize_r reports %i driver%s.",
-      status, (status == 1) ? "" : "s");
+  DEBUG("dbi plugin: cdbi_init: dbi_initialize_r reports %i driver%s.", status,
+        (status == 1) ? "" : "s");
 
   return (0);
 } /* }}} int cdbi_init */
 
-static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
-    udb_query_t *q, udb_query_preparation_area_t *prep_area)
-{
+static int cdbi_read_database_query(cdbi_database_t *db, /* {{{ */
+                                    udb_query_t *q,
+                                    udb_query_preparation_area_t *prep_area) {
   const char *statement;
   dbi_result res;
   size_t column_num;
@@ -487,79 +442,81 @@ static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
   char **column_values;
   int status;
 
-  /* Macro that cleans up dynamically allocated memory and returns the
-   * specified status. */
-#define BAIL_OUT(status) \
-  if (column_names != NULL) { sfree (column_names[0]); sfree (column_names); } \
-  if (column_values != NULL) { sfree (column_values[0]); sfree (column_values); } \
-  if (res != NULL) { dbi_result_free (res); res = NULL; } \
+/* Macro that cleans up dynamically allocated memory and returns the
+ * specified status. */
+#define BAIL_OUT(status)                                                       \
+  if (column_names != NULL) {                                                  \
+    sfree(column_names[0]);                                                    \
+    sfree(column_names);                                                       \
+  }                                                                            \
+  if (column_values != NULL) {                                                 \
+    sfree(column_values[0]);                                                   \
+    sfree(column_values);                                                      \
+  }                                                                            \
+  if (res != NULL) {                                                           \
+    dbi_result_free(res);                                                      \
+    res = NULL;                                                                \
+  }                                                                            \
   return (status)
 
   column_names = NULL;
   column_values = NULL;
 
-  statement = udb_query_get_statement (q);
-  assert (statement != NULL);
+  statement = udb_query_get_statement(q);
+  assert(statement != NULL);
 
-  res = dbi_conn_query (db->connection, statement);
-  if (res == NULL)
-  {
+  res = dbi_conn_query(db->connection, statement);
+  if (res == NULL) {
     char errbuf[1024];
-    ERROR ("dbi plugin: cdbi_read_database_query (%s, %s): "
-        "dbi_conn_query failed: %s",
-        db->name, udb_query_get_name (q),
-        cdbi_strerror (db->connection, errbuf, sizeof (errbuf)));
-    BAIL_OUT (-1);
-  }
-  else /* Get the number of columns */
+    ERROR("dbi plugin: cdbi_read_database_query (%s, %s): "
+          "dbi_conn_query failed: %s",
+          db->name, udb_query_get_name(q),
+          cdbi_strerror(db->connection, errbuf, sizeof(errbuf)));
+    BAIL_OUT(-1);
+  } else /* Get the number of columns */
   {
     unsigned int db_status;
 
-    db_status = dbi_result_get_numfields (res);
-    if (db_status == DBI_FIELD_ERROR)
-    {
+    db_status = dbi_result_get_numfields(res);
+    if (db_status == DBI_FIELD_ERROR) {
       char errbuf[1024];
-      ERROR ("dbi plugin: cdbi_read_database_query (%s, %s): "
-          "dbi_result_get_numfields failed: %s",
-          db->name, udb_query_get_name (q),
-          cdbi_strerror (db->connection, errbuf, sizeof (errbuf)));
-      BAIL_OUT (-1);
+      ERROR("dbi plugin: cdbi_read_database_query (%s, %s): "
+            "dbi_result_get_numfields failed: %s",
+            db->name, udb_query_get_name(q),
+            cdbi_strerror(db->connection, errbuf, sizeof(errbuf)));
+      BAIL_OUT(-1);
     }
 
-    column_num = (size_t) db_status;
-    DEBUG ("cdbi_read_database_query (%s, %s): There are %zu columns.",
-        db->name, udb_query_get_name (q), column_num);
+    column_num = (size_t)db_status;
+    DEBUG("cdbi_read_database_query (%s, %s): There are %zu columns.", db->name,
+          udb_query_get_name(q), column_num);
   }
 
   /* Allocate `column_names' and `column_values'. {{{ */
-  column_names = calloc (column_num, sizeof (*column_names));
-  if (column_names == NULL)
-  {
-    ERROR ("dbi plugin: calloc failed.");
-    BAIL_OUT (-1);
+  column_names = calloc(column_num, sizeof(*column_names));
+  if (column_names == NULL) {
+    ERROR("dbi plugin: calloc failed.");
+    BAIL_OUT(-1);
   }
 
-  column_names[0] = calloc (column_num, DATA_MAX_NAME_LEN);
-  if (column_names[0] == NULL)
-  {
-    ERROR ("dbi plugin: calloc failed.");
-    BAIL_OUT (-1);
+  column_names[0] = calloc(column_num, DATA_MAX_NAME_LEN);
+  if (column_names[0] == NULL) {
+    ERROR("dbi plugin: calloc failed.");
+    BAIL_OUT(-1);
   }
   for (size_t i = 1; i < column_num; i++)
     column_names[i] = column_names[i - 1] + DATA_MAX_NAME_LEN;
 
-  column_values = calloc (column_num, sizeof (*column_values));
-  if (column_values == NULL)
-  {
-    ERROR ("dbi plugin: calloc failed.");
-    BAIL_OUT (-1);
+  column_values = calloc(column_num, sizeof(*column_values));
+  if (column_values == NULL) {
+    ERROR("dbi plugin: calloc failed.");
+    BAIL_OUT(-1);
   }
 
-  column_values[0] = calloc (column_num, DATA_MAX_NAME_LEN);
-  if (column_values[0] == NULL)
-  {
-    ERROR ("dbi plugin: calloc failed.");
-    BAIL_OUT (-1);
+  column_values[0] = calloc(column_num, DATA_MAX_NAME_LEN);
+  if (column_values[0] == NULL) {
+    ERROR("dbi plugin: calloc failed.");
+    BAIL_OUT(-1);
   }
   for (size_t i = 1; i < column_num; i++)
     column_values[i] = column_values[i - 1] + DATA_MAX_NAME_LEN;
@@ -570,34 +527,33 @@ static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
   {
     const char *column_name;
 
-    column_name = dbi_result_get_field_name (res, (unsigned int) (i + 1));
-    if (column_name == NULL)
-    {
-      ERROR ("dbi plugin: cdbi_read_database_query (%s, %s): "
-          "Cannot retrieve name of field %zu.",
-          db->name, udb_query_get_name (q), i + 1);
-      BAIL_OUT (-1);
+    column_name = dbi_result_get_field_name(res, (unsigned int)(i + 1));
+    if (column_name == NULL) {
+      ERROR("dbi plugin: cdbi_read_database_query (%s, %s): "
+            "Cannot retrieve name of field %zu.",
+            db->name, udb_query_get_name(q), i + 1);
+      BAIL_OUT(-1);
     }
 
-    sstrncpy (column_names[i], column_name, DATA_MAX_NAME_LEN);
+    sstrncpy(column_names[i], column_name, DATA_MAX_NAME_LEN);
   } /* }}} for (i = 0; i < column_num; i++) */
 
-  udb_query_prepare_result (q, prep_area, (db->host ? db->host : hostname_g),
-      /* plugin = */ "dbi", db->name,
-      column_names, column_num, /* interval = */ (db->interval > 0) ? db->interval : 0);
+  udb_query_prepare_result(
+      q, prep_area, (db->host ? db->host : hostname_g),
+      /* plugin = */ "dbi", db->name, column_names, column_num,
+      /* interval = */ (db->interval > 0) ? db->interval : 0);
 
   /* 0 = error; 1 = success; */
-  status = dbi_result_first_row (res); /* {{{ */
-  if (status != 1)
-  {
+  status = dbi_result_first_row(res); /* {{{ */
+  if (status != 1) {
     char errbuf[1024];
-    ERROR ("dbi plugin: cdbi_read_database_query (%s, %s): "
-        "dbi_result_first_row failed: %s. Maybe the statement didn't "
-        "return any rows?",
-        db->name, udb_query_get_name (q),
-        cdbi_strerror (db->connection, errbuf, sizeof (errbuf)));
-    udb_query_finish_result (q, prep_area);
-    BAIL_OUT (-1);
+    ERROR("dbi plugin: cdbi_read_database_query (%s, %s): "
+          "dbi_result_first_row failed: %s. Maybe the statement didn't "
+          "return any rows?",
+          db->name, udb_query_get_name(q),
+          cdbi_strerror(db->connection, errbuf, sizeof(errbuf)));
+    udb_query_finish_result(q, prep_area);
+    BAIL_OUT(-1);
   } /* }}} */
 
   /* Iterate over all rows and call `udb_query_handle_result' with each list of
@@ -608,14 +564,13 @@ static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
     /* Copy the value of the columns to `column_values' */
     for (size_t i = 0; i < column_num; i++) /* {{{ */
     {
-      status = cdbi_result_get_field (res, (unsigned int) (i + 1),
-          column_values[i], DATA_MAX_NAME_LEN);
-
-      if (status != 0)
-      {
-        ERROR ("dbi plugin: cdbi_read_database_query (%s, %s): "
-            "cdbi_result_get_field (%zu) failed.",
-            db->name, udb_query_get_name (q), i + 1);
+      status = cdbi_result_get_field(res, (unsigned int)(i + 1),
+                                     column_values[i], DATA_MAX_NAME_LEN);
+
+      if (status != 0) {
+        ERROR("dbi plugin: cdbi_read_database_query (%s, %s): "
+              "cdbi_result_get_field (%zu) failed.",
+              db->name, udb_query_get_name(q), i + 1);
         status = -1;
         break;
       }
@@ -625,76 +580,68 @@ static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
      * to dispatch the row to the daemon. */
     if (status == 0) /* {{{ */
     {
-      status = udb_query_handle_result (q, prep_area, column_values);
-      if (status != 0)
-      {
-        ERROR ("dbi plugin: cdbi_read_database_query (%s, %s): "
-            "udb_query_handle_result failed.",
-            db->name, udb_query_get_name (q));
+      status = udb_query_handle_result(q, prep_area, column_values);
+      if (status != 0) {
+        ERROR("dbi plugin: cdbi_read_database_query (%s, %s): "
+              "udb_query_handle_result failed.",
+              db->name, udb_query_get_name(q));
       }
     } /* }}} */
 
     /* Get the next row from the database. */
-    status = dbi_result_next_row (res); /* {{{ */
-    if (status != 1)
-    {
-      if (dbi_conn_error (db->connection, NULL) != 0)
-      {
+    status = dbi_result_next_row(res); /* {{{ */
+    if (status != 1) {
+      if (dbi_conn_error(db->connection, NULL) != 0) {
         char errbuf[1024];
-        WARNING ("dbi plugin: cdbi_read_database_query (%s, %s): "
-            "dbi_result_next_row failed: %s.",
-            db->name, udb_query_get_name (q),
-            cdbi_strerror (db->connection, errbuf, sizeof (errbuf)));
+        WARNING("dbi plugin: cdbi_read_database_query (%s, %s): "
+                "dbi_result_next_row failed: %s.",
+                db->name, udb_query_get_name(q),
+                cdbi_strerror(db->connection, errbuf, sizeof(errbuf)));
       }
       break;
     } /* }}} */
-  } /* }}} while (42) */
+  }   /* }}} while (42) */
 
   /* Tell the db query interface that we're done with this query. */
-  udb_query_finish_result (q, prep_area);
+  udb_query_finish_result(q, prep_area);
 
   /* Clean up and return `status = 0' (success) */
-  BAIL_OUT (0);
+  BAIL_OUT(0);
 #undef BAIL_OUT
 } /* }}} int cdbi_read_database_query */
 
-static int cdbi_connect_database (cdbi_database_t *db) /* {{{ */
+static int cdbi_connect_database(cdbi_database_t *db) /* {{{ */
 {
   dbi_driver driver;
   dbi_conn connection;
   int status;
 
-  if (db->connection != NULL)
-  {
-    status = dbi_conn_ping (db->connection);
+  if (db->connection != NULL) {
+    status = dbi_conn_ping(db->connection);
     if (status != 0) /* connection is alive */
       return (0);
 
-    dbi_conn_close (db->connection);
+    dbi_conn_close(db->connection);
     db->connection = NULL;
   }
 
-  driver = dbi_driver_open_r (db->driver, dbi_instance);
-  if (driver == NULL)
-  {
-    ERROR ("dbi plugin: cdbi_connect_database: dbi_driver_open_r (%s) failed.",
-        db->driver);
-    INFO ("dbi plugin: Maybe the driver isn't installed? "
-        "Known drivers are:");
-    for (driver = dbi_driver_list_r (NULL, dbi_instance);
-        driver != NULL;
-        driver = dbi_driver_list_r (driver, dbi_instance))
-    {
-      INFO ("dbi plugin: * %s", dbi_driver_get_name (driver));
+  driver = dbi_driver_open_r(db->driver, dbi_instance);
+  if (driver == NULL) {
+    ERROR("dbi plugin: cdbi_connect_database: dbi_driver_open_r (%s) failed.",
+          db->driver);
+    INFO("dbi plugin: Maybe the driver isn't installed? "
+         "Known drivers are:");
+    for (driver = dbi_driver_list_r(NULL, dbi_instance); driver != NULL;
+         driver = dbi_driver_list_r(driver, dbi_instance)) {
+      INFO("dbi plugin: * %s", dbi_driver_get_name(driver));
     }
     return (-1);
   }
 
-  connection = dbi_conn_open (driver);
-  if (connection == NULL)
-  {
-    ERROR ("dbi plugin: cdbi_connect_database: dbi_conn_open (%s) failed.",
-        db->driver);
+  connection = dbi_conn_open(driver);
+  if (connection == NULL) {
+    ERROR("dbi plugin: cdbi_connect_database: dbi_conn_open (%s) failed.",
+          db->driver);
     return (-1);
   }
 
@@ -703,75 +650,66 @@ static int cdbi_connect_database (cdbi_database_t *db) /* {{{ */
    * encountered, it will get a list of options understood by the driver and
    * report that as `INFO'. This way, users hopefully don't have too much
    * trouble finding out how to configure the plugin correctly.. */
-  for (size_t i = 0; i < db->driver_options_num; i++)
-  {
-    if (db->driver_options[i].is_numeric)
-    {
-      status = dbi_conn_set_option_numeric (connection,
-          db->driver_options[i].key, db->driver_options[i].value.numeric);
-      if (status != 0)
-      {
+  for (size_t i = 0; i < db->driver_options_num; i++) {
+    if (db->driver_options[i].is_numeric) {
+      status =
+          dbi_conn_set_option_numeric(connection, db->driver_options[i].key,
+                                      db->driver_options[i].value.numeric);
+      if (status != 0) {
         char errbuf[1024];
-        ERROR ("dbi plugin: cdbi_connect_database (%s): "
-            "dbi_conn_set_option_numeric (\"%s\", %i) failed: %s.",
-            db->name,
-            db->driver_options[i].key, db->driver_options[i].value.numeric,
-            cdbi_strerror (connection, errbuf, sizeof (errbuf)));
+        ERROR("dbi plugin: cdbi_connect_database (%s): "
+              "dbi_conn_set_option_numeric (\"%s\", %i) failed: %s.",
+              db->name, db->driver_options[i].key,
+              db->driver_options[i].value.numeric,
+              cdbi_strerror(connection, errbuf, sizeof(errbuf)));
       }
-    }
-    else
-    {
-      status = dbi_conn_set_option (connection,
-          db->driver_options[i].key, db->driver_options[i].value.string);
-      if (status != 0)
-      {
+    } else {
+      status = dbi_conn_set_option(connection, db->driver_options[i].key,
+                                   db->driver_options[i].value.string);
+      if (status != 0) {
         char errbuf[1024];
-        ERROR ("dbi plugin: cdbi_connect_database (%s): "
-            "dbi_conn_set_option (\"%s\", \"%s\") failed: %s.",
-            db->name,
-            db->driver_options[i].key, db->driver_options[i].value.string,
-            cdbi_strerror (connection, errbuf, sizeof (errbuf)));
+        ERROR("dbi plugin: cdbi_connect_database (%s): "
+              "dbi_conn_set_option (\"%s\", \"%s\") failed: %s.",
+              db->name, db->driver_options[i].key,
+              db->driver_options[i].value.string,
+              cdbi_strerror(connection, errbuf, sizeof(errbuf)));
       }
     }
 
-    if (status != 0)
-    {
-      INFO ("dbi plugin: This is a list of all options understood "
-          "by the `%s' driver:", db->driver);
-      for (const char *opt = dbi_conn_get_option_list (connection, NULL);
-          opt != NULL;
-          opt = dbi_conn_get_option_list (connection, opt))
-      {
-        INFO ("dbi plugin: * %s", opt);
+    if (status != 0) {
+      INFO("dbi plugin: This is a list of all options understood "
+           "by the `%s' driver:",
+           db->driver);
+      for (const char *opt = dbi_conn_get_option_list(connection, NULL);
+           opt != NULL; opt = dbi_conn_get_option_list(connection, opt)) {
+        INFO("dbi plugin: * %s", opt);
       }
 
-      dbi_conn_close (connection);
+      dbi_conn_close(connection);
       return (-1);
     }
   } /* for (i = 0; i < db->driver_options_num; i++) */
 
-  status = dbi_conn_connect (connection);
-  if (status != 0)
-  {
+  status = dbi_conn_connect(connection);
+  if (status != 0) {
     char errbuf[1024];
-    ERROR ("dbi plugin: cdbi_connect_database (%s): "
-        "dbi_conn_connect failed: %s",
-        db->name, cdbi_strerror (connection, errbuf, sizeof (errbuf)));
-    dbi_conn_close (connection);
+    ERROR("dbi plugin: cdbi_connect_database (%s): "
+          "dbi_conn_connect failed: %s",
+          db->name, cdbi_strerror(connection, errbuf, sizeof(errbuf)));
+    dbi_conn_close(connection);
     return (-1);
   }
 
-  if (db->select_db != NULL)
-  {
-    status = dbi_conn_select_db (connection, db->select_db);
-    if (status != 0)
-    {
+  if (db->select_db != NULL) {
+    status = dbi_conn_select_db(connection, db->select_db);
+    if (status != 0) {
       char errbuf[1024];
-      WARNING ("dbi plugin: cdbi_connect_database (%s): "
+      WARNING(
+          "dbi plugin: cdbi_connect_database (%s): "
           "dbi_conn_select_db (%s) failed: %s. Check the `SelectDB' option.",
           db->name, db->select_db,
-          cdbi_strerror (connection, errbuf, sizeof (errbuf)));
-      dbi_conn_close (connection);
+          cdbi_strerror(connection, errbuf, sizeof(errbuf)));
+      dbi_conn_close(connection);
       return (-1);
     }
   }
@@ -780,72 +718,67 @@ static int cdbi_connect_database (cdbi_database_t *db) /* {{{ */
   return (0);
 } /* }}} int cdbi_connect_database */
 
-static int cdbi_read_database (user_data_t *ud) /* {{{ */
+static int cdbi_read_database(user_data_t *ud) /* {{{ */
 {
-  cdbi_database_t *db = (cdbi_database_t *) ud->data;
+  cdbi_database_t *db = (cdbi_database_t *)ud->data;
   int success;
   int status;
 
   unsigned int db_version;
 
-  status = cdbi_connect_database (db);
+  status = cdbi_connect_database(db);
   if (status != 0)
     return (status);
-  assert (db->connection != NULL);
+  assert(db->connection != NULL);
 
-  db_version = dbi_conn_get_engine_version (db->connection);
+  db_version = dbi_conn_get_engine_version(db->connection);
   /* TODO: Complain if `db_version == 0' */
 
   success = 0;
-  for (size_t i = 0; i < db->queries_num; i++)
-  {
+  for (size_t i = 0; i < db->queries_num; i++) {
     /* Check if we know the database's version and if so, if this query applies
      * to that version. */
-    if ((db_version != 0)
-        && (udb_query_check_version (db->queries[i], db_version) == 0))
+    if ((db_version != 0) &&
+        (udb_query_check_version(db->queries[i], db_version) == 0))
       continue;
 
-    status = cdbi_read_database_query (db,
-        db->queries[i], db->q_prep_areas[i]);
+    status = cdbi_read_database_query(db, db->queries[i], db->q_prep_areas[i]);
     if (status == 0)
       success++;
   }
 
-  if (success == 0)
-  {
-    ERROR ("dbi plugin: All queries failed for database `%s'.", db->name);
+  if (success == 0) {
+    ERROR("dbi plugin: All queries failed for database `%s'.", db->name);
     return (-1);
   }
 
   return (0);
 } /* }}} int cdbi_read_database */
 
-static int cdbi_shutdown (void) /* {{{ */
+static int cdbi_shutdown(void) /* {{{ */
 {
-  for (size_t i = 0; i < databases_num; i++)
-  {
-    if (databases[i]->connection != NULL)
-    {
-      dbi_conn_close (databases[i]->connection);
+  for (size_t i = 0; i < databases_num; i++) {
+    if (databases[i]->connection != NULL) {
+      dbi_conn_close(databases[i]->connection);
       databases[i]->connection = NULL;
     }
-    cdbi_database_free (databases[i]);
+    cdbi_database_free(databases[i]);
   }
-  sfree (databases);
+  sfree(databases);
   databases_num = 0;
 
-  udb_query_free (queries, queries_num);
+  udb_query_free(queries, queries_num);
   queries = NULL;
   queries_num = 0;
 
   return (0);
 } /* }}} int cdbi_shutdown */
 
-void module_register (void) /* {{{ */
+void module_register(void) /* {{{ */
 {
-  plugin_register_complex_config ("dbi", cdbi_config);
-  plugin_register_init ("dbi", cdbi_init);
-  plugin_register_shutdown ("dbi", cdbi_shutdown);
+  plugin_register_complex_config("dbi", cdbi_config);
+  plugin_register_init("dbi", cdbi_init);
+  plugin_register_shutdown("dbi", cdbi_shutdown);
 } /* }}} void module_register */
 
 /*