X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcurl_json.c;h=e6c0b51389e90fb68af73b12aae4f37aba9368ce;hb=06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4;hp=d4e78039e3ab264c08cffeb95d3b4256789412b8;hpb=ec9ed6fe4108f7fd3d4ef84e887bb6d3dc022e14;p=collectd.git

diff --git a/src/curl_json.c b/src/curl_json.c
index d4e78039..f0badc99 100644
--- a/src/curl_json.c
+++ b/src/curl_json.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 #include "utils_avltree.h"
 #include "utils_complain.h"
 #include "utils_curl_stats.h"
@@ -37,33 +36,53 @@
 
 #include <yajl/yajl_parse.h>
 #if HAVE_YAJL_YAJL_VERSION_H
-# include <yajl/yajl_version.h>
+#include <yajl/yajl_version.h>
 #endif
 
 #if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1)
-# define HAVE_YAJL_V2 1
+#define HAVE_YAJL_V2 1
 #endif
 
 #define CJ_DEFAULT_HOST "localhost"
-#define CJ_KEY_MAGIC 0x43484b59UL /* CHKY */
-#define CJ_IS_KEY(key) ((key)->magic == CJ_KEY_MAGIC)
 #define CJ_ANY "*"
-#define COUCH_MIN(x,y) ((x) < (y) ? (x) : (y))
+#define COUCH_MIN(x, y) ((x) < (y) ? (x) : (y))
 
 struct cj_key_s;
 typedef struct cj_key_s cj_key_t;
 struct cj_key_s /* {{{ */
 {
-  unsigned long magic;
   char *path;
   char *type;
   char *instance;
 };
 /* }}} */
 
+/* cj_tree_entry_t is a union of either a metric configuration ("key") or a tree
+ * mapping array indexes / map keys to a descendant cj_tree_entry_t*. */
+typedef struct {
+  enum { KEY, TREE } type;
+  union {
+    c_avl_tree_t *tree;
+    cj_key_t *key;
+  };
+} cj_tree_entry_t;
+
+/* cj_state_t is a stack providing the configuration relevant for the context
+ * that is currently being parsed. If entry->type == KEY, the parser should
+ * expect a metric (a numeric value). If entry->type == TREE, the parser should
+ * expect an array of map to descent into. If entry == NULL, no configuration
+ * exists for this part of the JSON structure. */
+typedef struct {
+  cj_tree_entry_t *entry;
+  bool in_array;
+  int index;
+  char name[DATA_MAX_NAME_LEN];
+} cj_state_t;
+
 struct cj_s /* {{{ */
 {
   char *instance;
+  char *plugin_name;
   char *host;
 
   char *sock;
@@ -72,9 +91,9 @@ struct cj_s /* {{{ */
   char *user;
   char *pass;
   char *credentials;
-  _Bool digest;
-  _Bool verify_peer;
-  _Bool verify_host;
+  bool digest;
+  bool verify_peer;
+  bool verify_host;
   char *cacert;
   struct curl_slist *headers;
   char *post_body;
@@ -87,17 +106,8 @@ struct cj_s /* {{{ */
 
   yajl_handle yajl;
   c_avl_tree_t *tree;
-  cj_key_t *key;
   int depth;
-  struct {
-    union {
-      c_avl_tree_t *tree;
-      cj_key_t *key;
-    };
-    _Bool in_array;
-    int index;
-    char name[DATA_MAX_NAME_LEN];
-  } state[YAJL_MAX_DEPTH];
+  cj_state_t state[YAJL_MAX_DEPTH];
 };
 typedef struct cj_s cj_t; /* }}} */
 
@@ -107,12 +117,15 @@ typedef size_t yajl_len_t;
 typedef unsigned int yajl_len_t;
 #endif
 
-static int cj_read (user_data_t *ud);
-static void cj_submit (cj_t *db, cj_key_t *key, value_t *value);
+static int cj_read(user_data_t *ud);
+static void cj_submit_impl(cj_t *db, cj_key_t *key, value_t *value);
 
-static size_t cj_curl_callback (void *buf, /* {{{ */
-    size_t size, size_t nmemb, void *user_data)
-{
+/* cj_submit is a function pointer to cj_submit_impl, allowing the unit-test to
+ * overwrite which function is called. */
+static void (*cj_submit)(cj_t *, cj_key_t *, value_t *) = cj_submit_impl;
+
+static size_t cj_curl_callback(void *buf, /* {{{ */
+                               size_t size, size_t nmemb, void *user_data) {
   cj_t *db;
   size_t len;
   yajl_status status;
@@ -120,51 +133,48 @@ static size_t cj_curl_callback (void *buf, /* {{{ */
   len = size * nmemb;
 
   if (len == 0)
-    return (len);
+    return len;
 
   db = user_data;
   if (db == NULL)
-    return (0);
+    return 0;
 
   status = yajl_parse(db->yajl, (unsigned char *)buf, len);
   if (status == yajl_status_ok)
-    return (len);
+    return len;
 #if !HAVE_YAJL_V2
   else if (status == yajl_status_insufficient_data)
-    return (len);
+    return len;
 #endif
 
-  unsigned char *msg = yajl_get_error(db->yajl, /* verbose = */ 1,
-        /* jsonText = */ (unsigned char *) buf, (unsigned int) len);
-  ERROR ("curl_json plugin: yajl_parse failed: %s", msg);
+  unsigned char *msg =
+      yajl_get_error(db->yajl, /* verbose = */ 1,
+                     /* jsonText = */ (unsigned char *)buf, (unsigned int)len);
+  ERROR("curl_json plugin: yajl_parse failed: %s", msg);
   yajl_free_error(db->yajl, msg);
-  return (0); /* abort write callback */
+  return 0; /* abort write callback */
 } /* }}} size_t cj_curl_callback */
 
-static int cj_get_type (cj_key_t *key)
-{
-  const data_set_t *ds;
+static int cj_get_type(cj_key_t *key) {
+  if (key == NULL)
+    return -EINVAL;
 
-  ds = plugin_get_ds (key->type);
-  if (ds == NULL)
-  {
+  const data_set_t *ds = plugin_get_ds(key->type);
+  if (ds == NULL) {
     static char type[DATA_MAX_NAME_LEN] = "!!!invalid!!!";
 
-    assert (key->type != NULL);
-    if (strcmp (type, key->type) != 0)
-    {
-      ERROR ("curl_json plugin: Unable to look up DS type \"%s\".",
-          key->type);
-      sstrncpy (type, key->type, sizeof (type));
+    assert(key->type != NULL);
+    if (strcmp(type, key->type) != 0) {
+      ERROR("curl_json plugin: Unable to look up DS type \"%s\".", key->type);
+      sstrncpy(type, key->type, sizeof(type));
     }
 
     return -1;
-  }
-  else if (ds->ds_num > 1)
-  {
+  } else if (ds->ds_num > 1) {
     static c_complain_t complaint = C_COMPLAIN_INIT_STATIC;
 
-    c_complain_once (LOG_WARNING, &complaint,
+    c_complain_once(
+        LOG_WARNING, &complaint,
         "curl_json plugin: The type \"%s\" has more than one data source. "
         "This is currently not supported. I will return the type of the "
         "first data source, but this will likely lead to problems later on.",
@@ -174,349 +184,364 @@ static int cj_get_type (cj_key_t *key)
   return ds->ds[0].type;
 }
 
-static int cj_cb_map_key (void *ctx, const unsigned char *val,
-    yajl_len_t len);
+/* cj_load_key loads the configuration for "key" from the parent context and
+ * sets either .key or .tree in the current context. */
+static int cj_load_key(cj_t *db, char const *key) {
+  if (db == NULL || key == NULL || db->depth <= 0)
+    return EINVAL;
 
-static void cj_cb_inc_array_index (void *ctx, _Bool update_key)
-{
-  cj_t *db = (cj_t *)ctx;
+  sstrncpy(db->state[db->depth].name, key, sizeof(db->state[db->depth].name));
 
+  if (db->state[db->depth - 1].entry == NULL ||
+      db->state[db->depth - 1].entry->type != TREE) {
+    return 0;
+  }
+
+  c_avl_tree_t *tree = db->state[db->depth - 1].entry->tree;
+  cj_tree_entry_t *e = NULL;
+
+  if (c_avl_get(tree, key, (void *)&e) == 0) {
+    db->state[db->depth].entry = e;
+  } else if (c_avl_get(tree, CJ_ANY, (void *)&e) == 0) {
+    db->state[db->depth].entry = e;
+  } else {
+    db->state[db->depth].entry = NULL;
+  }
+
+  return 0;
+}
+
+static void cj_advance_array(cj_t *db) {
   if (!db->state[db->depth].in_array)
     return;
 
   db->state[db->depth].index++;
 
-  if (update_key)
-  {
-    char name[DATA_MAX_NAME_LEN];
-
-    ssnprintf (name, sizeof (name), "%d", db->state[db->depth].index - 1);
-
-    cj_cb_map_key (ctx, (unsigned char *)name, (yajl_len_t) strlen (name));
-  }
+  char name[DATA_MAX_NAME_LEN];
+  snprintf(name, sizeof(name), "%d", db->state[db->depth].index);
+  cj_load_key(db, name);
 }
 
 /* yajl callbacks */
-#define CJ_CB_ABORT    0
+#define CJ_CB_ABORT 0
 #define CJ_CB_CONTINUE 1
 
-static int cj_cb_boolean (void * ctx, int boolVal)
-{
-  cj_cb_inc_array_index (ctx, /* update_key = */ 0);
-  return (CJ_CB_CONTINUE);
+static int cj_cb_null(void *ctx) {
+  cj_advance_array(ctx);
+  return CJ_CB_CONTINUE;
 }
 
-static int cj_cb_null (void * ctx)
-{
-  cj_cb_inc_array_index (ctx, /* update_key = */ 0);
-  return (CJ_CB_CONTINUE);
-}
-
-static int cj_cb_number (void *ctx,
-    const char *number, yajl_len_t number_len)
-{
-  char buffer[number_len + 1];
-
+static int cj_cb_number(void *ctx, const char *number, yajl_len_t number_len) {
   cj_t *db = (cj_t *)ctx;
-  cj_key_t *key = db->state[db->depth].key;
-  value_t vt;
-  int type;
-  int status;
 
   /* Create a null-terminated version of the string. */
-  memcpy (buffer, number, number_len);
-  buffer[sizeof (buffer) - 1] = 0;
-
-  if ((key == NULL) || !CJ_IS_KEY (key)) {
-    if (key != NULL && !db->state[db->depth].in_array/*can be inhomogeneous*/)
-      NOTICE ("curl_json plugin: Found \"%s\", but the configuration expects"
-              " a map.", buffer);
-    cj_cb_inc_array_index (ctx, /* update_key = */ 1);
-    key = db->state[db->depth].key;
-    if (key == NULL) {
-      return (CJ_CB_CONTINUE);
+  char buffer[number_len + 1];
+  memcpy(buffer, number, number_len);
+  buffer[sizeof(buffer) - 1] = 0;
+
+  if (db->state[db->depth].entry == NULL ||
+      db->state[db->depth].entry->type != KEY) {
+    if (db->state[db->depth].entry != NULL) {
+      NOTICE("curl_json plugin: Found \"%s\", but the configuration expects a "
+             "map.",
+             buffer);
     }
-  }
-  else
-  {
-    cj_cb_inc_array_index (ctx, /* update_key = */ 1);
+    cj_advance_array(ctx);
+    return CJ_CB_CONTINUE;
   }
 
-  type = cj_get_type (key);
-  status = parse_value (buffer, &vt, type);
-  if (status != 0)
-  {
-    NOTICE ("curl_json plugin: Unable to parse number: \"%s\"", buffer);
-    return (CJ_CB_CONTINUE);
+  cj_key_t *key = db->state[db->depth].entry->key;
+
+  int type = cj_get_type(key);
+  value_t vt;
+  int status = parse_value(buffer, &vt, type);
+  if (status != 0) {
+    NOTICE("curl_json plugin: Unable to parse number: \"%s\"", buffer);
+    cj_advance_array(ctx);
+    return CJ_CB_CONTINUE;
   }
 
-  cj_submit (db, key, &vt);
-  return (CJ_CB_CONTINUE);
+  cj_submit(db, key, &vt);
+  cj_advance_array(ctx);
+  return CJ_CB_CONTINUE;
 } /* int cj_cb_number */
 
 /* Queries the key-tree of the parent context for "in_name" and, if found,
  * updates the "key" field of the current context. Otherwise, "key" is set to
  * NULL. */
-static int cj_cb_map_key (void *ctx,
-    unsigned char const *in_name, yajl_len_t in_name_len)
-{
-  cj_t *db = (cj_t *)ctx;
-  c_avl_tree_t *tree;
+static int cj_cb_map_key(void *ctx, unsigned char const *in_name,
+                         yajl_len_t in_name_len) {
+  char name[in_name_len + 1];
 
-  tree = db->state[db->depth-1].tree;
-
-  if (tree != NULL)
-  {
-    cj_key_t *value = NULL;
-    char *name;
-    size_t name_len;
-
-    /* Create a null-terminated version of the name. */
-    name = db->state[db->depth].name;
-    name_len = COUCH_MIN ((size_t) in_name_len,
-        sizeof (db->state[db->depth].name) - 1);
-    memcpy (name, in_name, name_len);
-    name[name_len] = 0;
-
-    if (c_avl_get (tree, name, (void *) &value) == 0) {
-      if (CJ_IS_KEY((cj_key_t*)value)) {
-        db->state[db->depth].key = value;
-      }
-      else {
-        db->state[db->depth].tree = (c_avl_tree_t*) value;
-      }
-    }
-    else if (c_avl_get (tree, CJ_ANY, (void *) &value) == 0)
-      if (CJ_IS_KEY((cj_key_t*)value)) {
-        db->state[db->depth].key = value;
-      }
-      else {
-        db->state[db->depth].tree = (c_avl_tree_t*) value;
-      }
-    else
-      db->state[db->depth].key = NULL;
-  }
+  memmove(name, in_name, in_name_len);
+  name[sizeof(name) - 1] = 0;
+
+  if (cj_load_key(ctx, name) != 0)
+    return CJ_CB_ABORT;
 
-  return (CJ_CB_CONTINUE);
+  return CJ_CB_CONTINUE;
 }
 
-static int cj_cb_string (void *ctx, const unsigned char *val,
-    yajl_len_t len)
-{
+static int cj_cb_string(void *ctx, const unsigned char *val, yajl_len_t len) {
   /* Handle the string as if it was a number. */
-  return (cj_cb_number (ctx, (const char *) val, len));
+  return cj_cb_number(ctx, (const char *)val, len);
 } /* int cj_cb_string */
 
-static int cj_cb_start (void *ctx)
-{
+static int cj_cb_boolean(void *ctx, int boolVal) {
+  if (boolVal)
+    return cj_cb_number(ctx, "1", 1);
+  else
+    return cj_cb_number(ctx, "0", 1);
+} /* int cj_cb_boolean */
+
+static int cj_cb_end(void *ctx) {
   cj_t *db = (cj_t *)ctx;
-  if (++db->depth >= YAJL_MAX_DEPTH)
-  {
-    ERROR ("curl_json plugin: %s depth exceeds max, aborting.",
-           db->url ? db->url : db->sock);
-    return (CJ_CB_ABORT);
-  }
-  return (CJ_CB_CONTINUE);
+  memset(&db->state[db->depth], 0, sizeof(db->state[db->depth]));
+  db->depth--;
+  cj_advance_array(ctx);
+  return CJ_CB_CONTINUE;
 }
 
-static int cj_cb_end (void *ctx)
-{
+static int cj_cb_start_map(void *ctx) {
   cj_t *db = (cj_t *)ctx;
-  db->state[db->depth].tree = NULL;
-  --db->depth;
-  return (CJ_CB_CONTINUE);
-}
 
-static int cj_cb_start_map (void *ctx)
-{
-  cj_cb_inc_array_index (ctx, /* update_key = */ 1);
-  return cj_cb_start (ctx);
+  if ((db->depth + 1) >= YAJL_MAX_DEPTH) {
+    ERROR("curl_json plugin: %s depth exceeds max, aborting.",
+          db->url ? db->url : db->sock);
+    return CJ_CB_ABORT;
+  }
+  db->depth++;
+  return CJ_CB_CONTINUE;
 }
 
-static int cj_cb_end_map (void *ctx)
-{
-  return cj_cb_end (ctx);
-}
+static int cj_cb_end_map(void *ctx) { return cj_cb_end(ctx); }
 
-static int cj_cb_start_array (void * ctx)
-{
+static int cj_cb_start_array(void *ctx) {
   cj_t *db = (cj_t *)ctx;
-  cj_cb_inc_array_index (ctx, /* update_key = */ 1);
-  if (db->depth+1 < YAJL_MAX_DEPTH) {
-    db->state[db->depth+1].in_array = 1;
-    db->state[db->depth+1].index = 0;
+
+  if ((db->depth + 1) >= YAJL_MAX_DEPTH) {
+    ERROR("curl_json plugin: %s depth exceeds max, aborting.",
+          db->url ? db->url : db->sock);
+    return CJ_CB_ABORT;
   }
-  return cj_cb_start (ctx);
+  db->depth++;
+  db->state[db->depth].in_array = true;
+  db->state[db->depth].index = 0;
+
+  cj_load_key(db, "0");
+
+  return CJ_CB_CONTINUE;
 }
 
-static int cj_cb_end_array (void * ctx)
-{
+static int cj_cb_end_array(void *ctx) {
   cj_t *db = (cj_t *)ctx;
-  db->state[db->depth].in_array = 0;
-  return cj_cb_end (ctx);
+  db->state[db->depth].in_array = false;
+  return cj_cb_end(ctx);
 }
 
 static yajl_callbacks ycallbacks = {
-  cj_cb_null, /* null */
-  cj_cb_boolean, /* boolean */
-  NULL, /* integer */
-  NULL, /* double */
-  cj_cb_number,
-  cj_cb_string,
-  cj_cb_start_map,
-  cj_cb_map_key,
-  cj_cb_end_map,
-  cj_cb_start_array,
-  cj_cb_end_array
-};
+    cj_cb_null,    /* null */
+    cj_cb_boolean, /* boolean */
+    NULL,          /* integer */
+    NULL,          /* double */
+    cj_cb_number,  cj_cb_string,      cj_cb_start_map, cj_cb_map_key,
+    cj_cb_end_map, cj_cb_start_array, cj_cb_end_array};
 
 /* end yajl callbacks */
 
-static void cj_key_free (cj_key_t *key) /* {{{ */
+static void cj_key_free(cj_key_t *key) /* {{{ */
 {
   if (key == NULL)
     return;
 
-  sfree (key->path);
-  sfree (key->type);
-  sfree (key->instance);
+  sfree(key->path);
+  sfree(key->type);
+  sfree(key->instance);
 
-  sfree (key);
+  sfree(key);
 } /* }}} void cj_key_free */
 
-static void cj_tree_free (c_avl_tree_t *tree) /* {{{ */
+static void cj_tree_free(c_avl_tree_t *tree) /* {{{ */
 {
   char *name;
-  void *value;
+  cj_tree_entry_t *e;
 
-  while (c_avl_pick (tree, (void *) &name, (void *) &value) == 0)
-  {
-    cj_key_t *key = (cj_key_t *)value;
+  while (c_avl_pick(tree, (void *)&name, (void *)&e) == 0) {
+    sfree(name);
 
-    if (CJ_IS_KEY(key))
-      cj_key_free (key);
+    if (e->type == KEY)
+      cj_key_free(e->key);
     else
-      cj_tree_free ((c_avl_tree_t *)value);
-
-    sfree (name);
+      cj_tree_free(e->tree);
+    sfree(e);
   }
 
-  c_avl_destroy (tree);
+  c_avl_destroy(tree);
 } /* }}} void cj_tree_free */
 
-static void cj_free (void *arg) /* {{{ */
+static void cj_free(void *arg) /* {{{ */
 {
   cj_t *db;
 
-  DEBUG ("curl_json plugin: cj_free (arg = %p);", arg);
+  DEBUG("curl_json plugin: cj_free (arg = %p);", arg);
 
-  db = (cj_t *) arg;
+  db = (cj_t *)arg;
 
   if (db == NULL)
     return;
 
   if (db->curl != NULL)
-    curl_easy_cleanup (db->curl);
+    curl_easy_cleanup(db->curl);
   db->curl = NULL;
 
   if (db->tree != NULL)
-    cj_tree_free (db->tree);
+    cj_tree_free(db->tree);
   db->tree = NULL;
 
-  sfree (db->instance);
-  sfree (db->host);
+  sfree(db->instance);
+  sfree(db->plugin_name);
+  sfree(db->host);
 
-  sfree (db->sock);
+  sfree(db->sock);
 
-  sfree (db->url);
-  sfree (db->user);
-  sfree (db->pass);
-  sfree (db->credentials);
-  sfree (db->cacert);
-  sfree (db->post_body);
-  curl_slist_free_all (db->headers);
-  curl_stats_destroy (db->stats);
+  sfree(db->url);
+  sfree(db->user);
+  sfree(db->pass);
+  sfree(db->credentials);
+  sfree(db->cacert);
+  sfree(db->post_body);
+  curl_slist_free_all(db->headers);
+  curl_stats_destroy(db->stats);
 
-  sfree (db);
+  sfree(db);
 } /* }}} void cj_free */
 
 /* Configuration handling functions {{{ */
 
-static c_avl_tree_t *cj_avl_create(void)
-{
-  return c_avl_create ((int (*) (const void *, const void *)) strcmp);
+static c_avl_tree_t *cj_avl_create(void) {
+  return c_avl_create((int (*)(const void *, const void *))strcmp);
 }
 
-static int cj_config_append_string (const char *name, struct curl_slist **dest, /* {{{ */
-    oconfig_item_t *ci)
-{
+static int cj_config_append_string(const char *name,
+                                   struct curl_slist **dest, /* {{{ */
+                                   oconfig_item_t *ci) {
   struct curl_slist *temp = NULL;
-  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
-  {
-    WARNING ("curl_json plugin: `%s' needs exactly one string argument.", name);
-    return (-1);
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) {
+    WARNING("curl_json plugin: `%s' needs exactly one string argument.", name);
+    return -1;
   }
 
   temp = curl_slist_append(*dest, ci->values[0].value.string);
   if (temp == NULL)
-    return (-1);
+    return -1;
 
   *dest = temp;
 
-  return (0);
+  return 0;
 } /* }}} int cj_config_append_string */
 
-static int cj_config_add_key (cj_t *db, /* {{{ */
-                                   oconfig_item_t *ci)
-{
+/* cj_append_key adds key to the configuration stored in db.
+ *
+ * For example:
+ * "httpd/requests/count",
+ * "httpd/requests/current" ->
+ * { "httpd": { "requests": { "count": $key, "current": $key } } }
+ */
+static int cj_append_key(cj_t *db, cj_key_t *key) { /* {{{ */
+  if (db->tree == NULL)
+    db->tree = cj_avl_create();
+
+  c_avl_tree_t *tree = db->tree;
+
+  char const *start = key->path;
+  if (*start == '/')
+    ++start;
+
+  char const *end;
+  while ((end = strchr(start, '/')) != NULL) {
+    char name[PATH_MAX];
+
+    size_t len = end - start;
+    if (len == 0)
+      break;
+
+    len = COUCH_MIN(len, sizeof(name) - 1);
+    sstrncpy(name, start, len + 1);
+
+    cj_tree_entry_t *e;
+    if (c_avl_get(tree, name, (void *)&e) != 0) {
+      e = calloc(1, sizeof(*e));
+      if (e == NULL)
+        return ENOMEM;
+      e->type = TREE;
+      e->tree = cj_avl_create();
+
+      c_avl_insert(tree, strdup(name), e);
+    }
+
+    if (e->type != TREE)
+      return EINVAL;
+
+    tree = e->tree;
+    start = end + 1;
+  }
+
+  if (strlen(start) == 0) {
+    ERROR("curl_json plugin: invalid key: %s", key->path);
+    return -1;
+  }
+
+  cj_tree_entry_t *e = calloc(1, sizeof(*e));
+  if (e == NULL)
+    return ENOMEM;
+  e->type = KEY;
+  e->key = key;
+
+  c_avl_insert(tree, strdup(start), e);
+  return 0;
+} /* }}} int cj_append_key */
+
+static int cj_config_add_key(cj_t *db, /* {{{ */
+                             oconfig_item_t *ci) {
   cj_key_t *key;
   int status;
 
-  if ((ci->values_num != 1)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING))
-  {
-    WARNING ("curl_json plugin: The `Key' block "
-             "needs exactly one string argument.");
-    return (-1);
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) {
+    WARNING("curl_json plugin: The `Key' block "
+            "needs exactly one string argument.");
+    return -1;
   }
 
-  key = calloc (1, sizeof (*key));
-  if (key == NULL)
-  {
-    ERROR ("curl_json plugin: calloc failed.");
-    return (-1);
+  key = calloc(1, sizeof(*key));
+  if (key == NULL) {
+    ERROR("curl_json plugin: calloc failed.");
+    return -1;
   }
-  key->magic = CJ_KEY_MAGIC;
 
-  if (strcasecmp ("Key", ci->key) == 0)
-  {
-    status = cf_util_get_string (ci, &key->path);
-    if (status != 0)
-    {
-      sfree (key);
-      return (status);
+  if (strcasecmp("Key", ci->key) == 0) {
+    status = cf_util_get_string(ci, &key->path);
+    if (status != 0) {
+      sfree(key);
+      return status;
     }
-  }
-  else
-  {
-    ERROR ("curl_json plugin: cj_config: "
-           "Invalid key: %s", ci->key);
-    cj_key_free (key);
-    return (-1);
+  } else {
+    ERROR("curl_json plugin: cj_config: "
+          "Invalid key: %s",
+          ci->key);
+    cj_key_free(key);
+    return -1;
   }
 
   status = 0;
-  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 ("Type", child->key) == 0)
-      status = cf_util_get_string (child, &key->type);
-    else if (strcasecmp ("Instance", child->key) == 0)
-      status = cf_util_get_string (child, &key->instance);
-    else
-    {
-      WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key);
+    if (strcasecmp("Type", child->key) == 0)
+      status = cf_util_get_string(child, &key->type);
+    else if (strcasecmp("Instance", child->key) == 0)
+      status = cf_util_get_string(child, &key->instance);
+    else {
+      WARNING("curl_json plugin: Option `%s' not allowed here.", child->key);
       status = -1;
     }
 
@@ -524,219 +549,165 @@ static int cj_config_add_key (cj_t *db, /* {{{ */
       break;
   } /* for (i = 0; i < ci->children_num; i++) */
 
-  if (status != 0)
-  {
-    cj_key_free (key);
-    return (-1);
-  }
-
-  if (key->type == NULL)
-  {
-    WARNING ("curl_json plugin: `Type' missing in `Key' block.");
-    cj_key_free (key);
-    return (-1);
+  if (status != 0) {
+    cj_key_free(key);
+    return -1;
   }
 
-  /* store path in a tree that will match the json map structure, example:
-   * "httpd/requests/count",
-   * "httpd/requests/current" ->
-   * { "httpd": { "requests": { "count": $key, "current": $key } } }
-   */
-  char *ptr;
-  char *name;
-  c_avl_tree_t *tree;
-
-  if (db->tree == NULL)
-    db->tree = cj_avl_create();
-
-  tree = db->tree;
-  ptr = key->path;
-  if (*ptr == '/')
-    ++ptr;
-
-  name = ptr;
-  while ((ptr = strchr (name, '/')) != NULL)
-  {
-    char ent[PATH_MAX];
-    c_avl_tree_t *value;
-    size_t len;
-
-    len = ptr - name;
-    if (len == 0)
-      break;
-
-    len = COUCH_MIN(len, sizeof (ent)-1);
-    sstrncpy (ent, name, len+1);
-
-    if (c_avl_get (tree, ent, (void *) &value) != 0)
-    {
-      value = cj_avl_create ();
-      c_avl_insert (tree, strdup (ent), value);
-    }
-
-    tree = value;
-    name = ptr + 1;
+  if (key->type == NULL) {
+    WARNING("curl_json plugin: `Type' missing in `Key' block.");
+    cj_key_free(key);
+    return -1;
   }
 
-  if (strlen (name) == 0)
-  {
-    ERROR ("curl_json plugin: invalid key: %s", key->path);
-    cj_key_free (key);
-    return (-1);
+  status = cj_append_key(db, key);
+  if (status != 0) {
+    cj_key_free(key);
+    return -1;
   }
 
-  c_avl_insert (tree, strdup (name), key);
-  return (status);
+  return 0;
 } /* }}} int cj_config_add_key */
 
-static int cj_init_curl (cj_t *db) /* {{{ */
+static int cj_init_curl(cj_t *db) /* {{{ */
 {
-  db->curl = curl_easy_init ();
-  if (db->curl == NULL)
-  {
-    ERROR ("curl_json plugin: curl_easy_init failed.");
-    return (-1);
+  db->curl = curl_easy_init();
+  if (db->curl == NULL) {
+    ERROR("curl_json plugin: curl_easy_init failed.");
+    return -1;
   }
 
-  curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1L);
-  curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, cj_curl_callback);
-  curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db);
-  curl_easy_setopt (db->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
-  curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
-  curl_easy_setopt (db->curl, CURLOPT_URL, db->url);
-  curl_easy_setopt (db->curl, CURLOPT_FOLLOWLOCATION, 1L);
-  curl_easy_setopt (db->curl, CURLOPT_MAXREDIRS, 50L);
-
-  if (db->user != NULL)
-  {
+  curl_easy_setopt(db->curl, CURLOPT_NOSIGNAL, 1L);
+  curl_easy_setopt(db->curl, CURLOPT_WRITEFUNCTION, cj_curl_callback);
+  curl_easy_setopt(db->curl, CURLOPT_WRITEDATA, db);
+  curl_easy_setopt(db->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT);
+  curl_easy_setopt(db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf);
+  curl_easy_setopt(db->curl, CURLOPT_FOLLOWLOCATION, 1L);
+  curl_easy_setopt(db->curl, CURLOPT_MAXREDIRS, 50L);
+
+  if (db->user != NULL) {
 #ifdef HAVE_CURLOPT_USERNAME
-    curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user);
-    curl_easy_setopt (db->curl, CURLOPT_PASSWORD,
-        (db->pass == NULL) ? "" : db->pass);
+    curl_easy_setopt(db->curl, CURLOPT_USERNAME, db->user);
+    curl_easy_setopt(db->curl, CURLOPT_PASSWORD,
+                     (db->pass == NULL) ? "" : db->pass);
 #else
     size_t credentials_size;
 
-    credentials_size = strlen (db->user) + 2;
+    credentials_size = strlen(db->user) + 2;
     if (db->pass != NULL)
-      credentials_size += strlen (db->pass);
+      credentials_size += strlen(db->pass);
 
-    db->credentials = malloc (credentials_size);
-    if (db->credentials == NULL)
-    {
-      ERROR ("curl_json plugin: malloc failed.");
-      return (-1);
+    db->credentials = malloc(credentials_size);
+    if (db->credentials == NULL) {
+      ERROR("curl_json plugin: malloc failed.");
+      return -1;
     }
 
-    ssnprintf (db->credentials, credentials_size, "%s:%s",
-               db->user, (db->pass == NULL) ? "" : db->pass);
-    curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials);
+    snprintf(db->credentials, credentials_size, "%s:%s", db->user,
+             (db->pass == NULL) ? "" : db->pass);
+    curl_easy_setopt(db->curl, CURLOPT_USERPWD, db->credentials);
 #endif
 
     if (db->digest)
-      curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+      curl_easy_setopt(db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
   }
 
-  curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer);
-  curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYHOST,
-                    db->verify_host ? 2L : 0L);
+  curl_easy_setopt(db->curl, CURLOPT_SSL_VERIFYPEER, (long)db->verify_peer);
+  curl_easy_setopt(db->curl, CURLOPT_SSL_VERIFYHOST, db->verify_host ? 2L : 0L);
   if (db->cacert != NULL)
-    curl_easy_setopt (db->curl, CURLOPT_CAINFO, db->cacert);
+    curl_easy_setopt(db->curl, CURLOPT_CAINFO, db->cacert);
   if (db->headers != NULL)
-    curl_easy_setopt (db->curl, CURLOPT_HTTPHEADER, db->headers);
+    curl_easy_setopt(db->curl, CURLOPT_HTTPHEADER, db->headers);
   if (db->post_body != NULL)
-    curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body);
+    curl_easy_setopt(db->curl, CURLOPT_POSTFIELDS, db->post_body);
 
 #ifdef HAVE_CURLOPT_TIMEOUT_MS
   if (db->timeout >= 0)
-    curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout);
+    curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS, (long)db->timeout);
   else if (db->interval > 0)
-    curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) CDTIME_T_TO_MS(db->timeout));
+    curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS,
+                     (long)CDTIME_T_TO_MS(db->interval));
   else
-    curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) CDTIME_T_TO_MS(plugin_get_interval()));
+    curl_easy_setopt(db->curl, CURLOPT_TIMEOUT_MS,
+                     (long)CDTIME_T_TO_MS(plugin_get_interval()));
 #endif
 
-  return (0);
+  return 0;
 } /* }}} int cj_init_curl */
 
-static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
+static int cj_config_add_url(oconfig_item_t *ci) /* {{{ */
 {
   cj_t *db;
   int status = 0;
 
-  if ((ci->values_num != 1)
-      || (ci->values[0].type != OCONFIG_TYPE_STRING))
-  {
-    WARNING ("curl_json plugin: The `URL' block "
-             "needs exactly one string argument.");
-    return (-1);
+  if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) {
+    WARNING("curl_json plugin: The `URL' block "
+            "needs exactly one string argument.");
+    return -1;
   }
 
-  db = calloc (1, sizeof (*db));
-  if (db == NULL)
-  {
-    ERROR ("curl_json plugin: calloc failed.");
-    return (-1);
+  db = calloc(1, sizeof(*db));
+  if (db == NULL) {
+    ERROR("curl_json plugin: calloc failed.");
+    return -1;
   }
 
   db->timeout = -1;
 
-  if (strcasecmp ("URL", ci->key) == 0)
-    status = cf_util_get_string (ci, &db->url);
-  else if (strcasecmp ("Sock", ci->key) == 0)
-    status = cf_util_get_string (ci, &db->sock);
-  else
-  {
-    ERROR ("curl_json plugin: cj_config: "
-           "Invalid key: %s", ci->key);
-    cj_free (db);
-    return (-1);
+  if (strcasecmp("URL", ci->key) == 0)
+    status = cf_util_get_string(ci, &db->url);
+  else if (strcasecmp("Sock", ci->key) == 0)
+    status = cf_util_get_string(ci, &db->sock);
+  else {
+    ERROR("curl_json plugin: cj_config: "
+          "Invalid key: %s",
+          ci->key);
+    cj_free(db);
+    return -1;
   }
-  if (status != 0)
-  {
-    sfree (db);
-    return (status);
+  if (status != 0) {
+    sfree(db);
+    return status;
   }
 
   /* Fill the `cj_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 ("Instance", child->key) == 0)
-      status = cf_util_get_string (child, &db->instance);
-    else if (strcasecmp ("Host", child->key) == 0)
-      status = cf_util_get_string (child, &db->host);
-    else if (db->url && strcasecmp ("User", child->key) == 0)
-      status = cf_util_get_string (child, &db->user);
-    else if (db->url && strcasecmp ("Password", child->key) == 0)
-      status = cf_util_get_string (child, &db->pass);
-    else if (strcasecmp ("Digest", child->key) == 0)
-      status = cf_util_get_boolean (child, &db->digest);
-    else if (db->url && strcasecmp ("VerifyPeer", child->key) == 0)
-      status = cf_util_get_boolean (child, &db->verify_peer);
-    else if (db->url && strcasecmp ("VerifyHost", child->key) == 0)
-      status = cf_util_get_boolean (child, &db->verify_host);
-    else if (db->url && strcasecmp ("CACert", child->key) == 0)
-      status = cf_util_get_string (child, &db->cacert);
-    else if (db->url && strcasecmp ("Header", child->key) == 0)
-      status = cj_config_append_string ("Header", &db->headers, child);
-    else if (db->url && strcasecmp ("Post", child->key) == 0)
-      status = cf_util_get_string (child, &db->post_body);
-    else if (strcasecmp ("Key", child->key) == 0)
-      status = cj_config_add_key (db, child);
-    else if (strcasecmp ("Interval", child->key) == 0)
+    if (strcasecmp("Instance", child->key) == 0)
+      status = cf_util_get_string(child, &db->instance);
+    else if (strcasecmp("Plugin", child->key) == 0)
+      status = cf_util_get_string(child, &db->plugin_name);
+    else if (strcasecmp("Host", child->key) == 0)
+      status = cf_util_get_string(child, &db->host);
+    else if (db->url && strcasecmp("User", child->key) == 0)
+      status = cf_util_get_string(child, &db->user);
+    else if (db->url && strcasecmp("Password", child->key) == 0)
+      status = cf_util_get_string(child, &db->pass);
+    else if (strcasecmp("Digest", child->key) == 0)
+      status = cf_util_get_boolean(child, &db->digest);
+    else if (db->url && strcasecmp("VerifyPeer", child->key) == 0)
+      status = cf_util_get_boolean(child, &db->verify_peer);
+    else if (db->url && strcasecmp("VerifyHost", child->key) == 0)
+      status = cf_util_get_boolean(child, &db->verify_host);
+    else if (db->url && strcasecmp("CACert", child->key) == 0)
+      status = cf_util_get_string(child, &db->cacert);
+    else if (db->url && strcasecmp("Header", child->key) == 0)
+      status = cj_config_append_string("Header", &db->headers, child);
+    else if (db->url && strcasecmp("Post", child->key) == 0)
+      status = cf_util_get_string(child, &db->post_body);
+    else if (strcasecmp("Key", child->key) == 0)
+      status = cj_config_add_key(db, child);
+    else if (strcasecmp("Interval", child->key) == 0)
       status = cf_util_get_cdtime(child, &db->interval);
-    else if (strcasecmp ("Timeout", child->key) == 0)
-      status = cf_util_get_int (child, &db->timeout);
-    else if (strcasecmp ("Statistics", child->key) == 0)
-    {
-      db->stats = curl_stats_from_config (child);
+    else if (strcasecmp("Timeout", child->key) == 0)
+      status = cf_util_get_int(child, &db->timeout);
+    else if (strcasecmp("Statistics", child->key) == 0) {
+      db->stats = curl_stats_from_config(child);
       if (db->stats == NULL)
         status = -1;
-    }
-    else
-    {
-      WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key);
+    } else {
+      WARNING("curl_json plugin: Option `%s' not allowed here.", child->key);
       status = -1;
     }
 
@@ -744,52 +715,44 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
       break;
   }
 
-  if (status == 0)
-  {
-    if (db->tree == NULL)
-    {
-      WARNING ("curl_json plugin: No (valid) `Key' block within `%s' \"`%s'\".",
-               db->url ? "URL" : "Sock", db->url ? db->url : db->sock);
+  if (status == 0) {
+    if (db->tree == NULL) {
+      WARNING("curl_json plugin: No (valid) `Key' block within `%s' \"`%s'\".",
+              db->url ? "URL" : "Sock", db->url ? db->url : db->sock);
       status = -1;
     }
     if (status == 0 && db->url)
-      status = cj_init_curl (db);
+      status = cj_init_curl(db);
   }
 
   /* If all went well, register this database for reading */
-  if (status == 0)
-  {
-    user_data_t ud = { 0 };
+  if (status == 0) {
     char *cb_name;
 
     if (db->instance == NULL)
       db->instance = strdup("default");
 
-    DEBUG ("curl_json plugin: Registering new read callback: %s",
-           db->instance);
-
-    ud.data = (void *) db;
-    ud.free_func = cj_free;
+    DEBUG("curl_json plugin: Registering new read callback: %s", db->instance);
 
-    cb_name = ssnprintf_alloc ("curl_json-%s-%s",
-               db->instance, db->url ? db->url : db->sock);
+    cb_name = ssnprintf_alloc("curl_json-%s-%s", db->instance,
+                              db->url ? db->url : db->sock);
 
-    plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read,
-                                  /* interval = */ db->interval,
-                                  &ud);
-    sfree (cb_name);
-  }
-  else
-  {
-    cj_free (db);
-    return (-1);
+    plugin_register_complex_read(/* group = */ NULL, cb_name, cj_read,
+                                 /* interval = */ db->interval,
+                                 &(user_data_t){
+                                     .data = db, .free_func = cj_free,
+                                 });
+    sfree(cb_name);
+  } else {
+    cj_free(db);
+    return -1;
   }
 
-  return (0);
+  return 0;
 }
- /* }}} int cj_config_add_database */
+/* }}} int cj_config_add_database */
 
-static int cj_config (oconfig_item_t *ci) /* {{{ */
+static int cj_config(oconfig_item_t *ci) /* {{{ */
 {
   int success;
   int errors;
@@ -798,170 +761,158 @@ static int cj_config (oconfig_item_t *ci) /* {{{ */
   success = 0;
   errors = 0;
 
-  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 ("Sock", child->key) == 0
-        || strcasecmp ("URL", child->key) == 0)
-    {
-      status = cj_config_add_url (child);
+    if (strcasecmp("Sock", child->key) == 0 ||
+        strcasecmp("URL", child->key) == 0) {
+      status = cj_config_add_url(child);
       if (status == 0)
         success++;
       else
         errors++;
-    }
-    else
-    {
-      WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key);
+    } else {
+      WARNING("curl_json plugin: Option `%s' not allowed here.", child->key);
       errors++;
     }
   }
 
-  if ((success == 0) && (errors > 0))
-  {
-    ERROR ("curl_json plugin: All statements failed.");
-    return (-1);
+  if ((success == 0) && (errors > 0)) {
+    ERROR("curl_json plugin: All statements failed.");
+    return -1;
   }
 
-  return (0);
+  return 0;
 } /* }}} int cj_config */
 
 /* }}} End of configuration handling functions */
 
-static const char *cj_host (cj_t *db) /* {{{ */
+static const char *cj_host(cj_t *db) /* {{{ */
 {
-  if ((db->host == NULL)
-      || (strcmp ("", db->host) == 0)
-      || (strcmp (CJ_DEFAULT_HOST, db->host) == 0))
+  if ((db->host == NULL) || (strcmp("", db->host) == 0) ||
+      (strcmp(CJ_DEFAULT_HOST, db->host) == 0))
     return hostname_g;
   return db->host;
 } /* }}} cj_host */
 
-static void cj_submit (cj_t *db, cj_key_t *key, value_t *value) /* {{{ */
+static void cj_submit_impl(cj_t *db, cj_key_t *key, value_t *value) /* {{{ */
 {
   value_list_t vl = VALUE_LIST_INIT;
 
-  vl.values     = value;
+  vl.values = value;
   vl.values_len = 1;
 
-  if (key->instance == NULL)
-  {
+  if (key->instance == NULL) {
     int len = 0;
     for (int i = 0; i < db->depth; i++)
-      len += ssnprintf(vl.type_instance+len, sizeof(vl.type_instance)-len,
-                       i ? "-%s" : "%s", db->state[i+1].name);
-  }
-  else
-    sstrncpy (vl.type_instance, key->instance, sizeof (vl.type_instance));
+      len += snprintf(vl.type_instance + len, sizeof(vl.type_instance) - len,
+                      i ? "-%s" : "%s", db->state[i + 1].name);
+  } else
+    sstrncpy(vl.type_instance, key->instance, sizeof(vl.type_instance));
 
-  sstrncpy (vl.host, cj_host (db), sizeof (vl.host));
-  sstrncpy (vl.plugin, "curl_json", sizeof (vl.plugin));
-  sstrncpy (vl.plugin_instance, db->instance, sizeof (vl.plugin_instance));
-  sstrncpy (vl.type, key->type, sizeof (vl.type));
+  sstrncpy(vl.host, cj_host(db), sizeof(vl.host));
+  sstrncpy(vl.plugin, (db->plugin_name != NULL) ? db->plugin_name : "curl_json",
+           sizeof(vl.plugin));
+  sstrncpy(vl.plugin_instance, db->instance, sizeof(vl.plugin_instance));
+  sstrncpy(vl.type, key->type, sizeof(vl.type));
 
   if (db->interval > 0)
     vl.interval = db->interval;
 
-  plugin_dispatch_values (&vl);
-} /* }}} int cj_submit */
+  plugin_dispatch_values(&vl);
+} /* }}} int cj_submit_impl */
 
-static int cj_sock_perform (cj_t *db) /* {{{ */
+static int cj_sock_perform(cj_t *db) /* {{{ */
 {
-  char errbuf[1024];
-  struct sockaddr_un sa_unix = { 0 };
-  sa_unix.sun_family = AF_UNIX;
-  sstrncpy (sa_unix.sun_path, db->sock, sizeof (sa_unix.sun_path));
+  struct sockaddr_un sa_unix = {
+      .sun_family = AF_UNIX,
+  };
+  sstrncpy(sa_unix.sun_path, db->sock, sizeof(sa_unix.sun_path));
 
-  int fd = socket (AF_UNIX, SOCK_STREAM, 0);
+  int fd = socket(AF_UNIX, SOCK_STREAM, 0);
   if (fd < 0)
-    return (-1);
-  if (connect (fd, (struct sockaddr *)&sa_unix, sizeof(sa_unix)) < 0)
-  {
-    ERROR ("curl_json plugin: connect(%s) failed: %s",
-           (db->sock != NULL) ? db->sock : "<null>",
-           sstrerror(errno, errbuf, sizeof (errbuf)));
-    close (fd);
-    return (-1);
+    return -1;
+  if (connect(fd, (struct sockaddr *)&sa_unix, sizeof(sa_unix)) < 0) {
+    ERROR("curl_json plugin: connect(%s) failed: %s",
+          (db->sock != NULL) ? db->sock : "<null>", STRERRNO);
+    close(fd);
+    return -1;
   }
 
   ssize_t red;
   do {
     unsigned char buffer[4096];
-    red = read (fd, buffer, sizeof(buffer));
+    red = read(fd, buffer, sizeof(buffer));
     if (red < 0) {
-        ERROR ("curl_json plugin: read(%s) failed: %s",
-               (db->sock != NULL) ? db->sock : "<null>",
-               sstrerror(errno, errbuf, sizeof (errbuf)));
-        close (fd);
-        return (-1);
+      ERROR("curl_json plugin: read(%s) failed: %s",
+            (db->sock != NULL) ? db->sock : "<null>", STRERRNO);
+      close(fd);
+      return -1;
     }
-    if (!cj_curl_callback (buffer, red, 1, db))
-        break;
+    if (!cj_curl_callback(buffer, red, 1, db))
+      break;
   } while (red > 0);
-  close (fd);
-  return (0);
+  close(fd);
+  return 0;
 } /* }}} int cj_sock_perform */
 
-
 static int cj_curl_perform(cj_t *db) /* {{{ */
 {
   int status;
   long rc;
   char *url;
-  url = db->url;
-
-  status = curl_easy_perform (db->curl);
-  if (status != CURLE_OK)
-  {
-    ERROR ("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)",
-           status, db->curl_errbuf, url);
-    return (-1);
+
+  curl_easy_setopt(db->curl, CURLOPT_URL, db->url);
+
+  status = curl_easy_perform(db->curl);
+  if (status != CURLE_OK) {
+    ERROR("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)",
+          status, db->curl_errbuf, db->url);
+    return -1;
   }
   if (db->stats != NULL)
-    curl_stats_dispatch (db->stats, db->curl, cj_host (db), "curl_json", db->instance);
+    curl_stats_dispatch(db->stats, db->curl, cj_host(db), "curl_json",
+                        db->instance);
 
   curl_easy_getinfo(db->curl, CURLINFO_EFFECTIVE_URL, &url);
   curl_easy_getinfo(db->curl, CURLINFO_RESPONSE_CODE, &rc);
 
   /* The response code is zero if a non-HTTP transport was used. */
-  if ((rc != 0) && (rc != 200))
-  {
-    ERROR ("curl_json plugin: curl_easy_perform failed with "
-        "response code %ld (%s)", rc, url);
-    return (-1);
+  if ((rc != 0) && (rc != 200)) {
+    ERROR("curl_json plugin: curl_easy_perform failed with "
+          "response code %ld (%s)",
+          rc, url);
+    return -1;
   }
-  return (0);
+  return 0;
 } /* }}} int cj_curl_perform */
 
-static int cj_perform (cj_t *db) /* {{{ */
+static int cj_perform(cj_t *db) /* {{{ */
 {
   int status;
   yajl_handle yprev = db->yajl;
 
-  db->yajl = yajl_alloc (&ycallbacks,
+  db->yajl = yajl_alloc(&ycallbacks,
 #if HAVE_YAJL_V2
-      /* alloc funcs = */ NULL,
+                        /* alloc funcs = */ NULL,
 #else
-      /* alloc funcs = */ NULL, NULL,
+                        /* alloc funcs = */ NULL, NULL,
 #endif
-      /* context = */ (void *)db);
-  if (db->yajl == NULL)
-  {
-    ERROR ("curl_json plugin: yajl_alloc failed.");
+                        /* context = */ (void *)db);
+  if (db->yajl == NULL) {
+    ERROR("curl_json plugin: yajl_alloc failed.");
     db->yajl = yprev;
-    return (-1);
+    return -1;
   }
 
   if (db->url)
-    status = cj_curl_perform (db);
+    status = cj_curl_perform(db);
   else
-    status = cj_sock_perform (db);
-  if (status < 0)
-  {
-    yajl_free (db->yajl);
+    status = cj_sock_perform(db);
+  if (status < 0) {
+    yajl_free(db->yajl);
     db->yajl = yprev;
-    return (-1);
+    return -1;
   }
 
 #if HAVE_YAJL_V2
@@ -969,57 +920,60 @@ static int cj_perform (cj_t *db) /* {{{ */
 #else
   status = yajl_parse_complete(db->yajl);
 #endif
-  if (status != yajl_status_ok)
-  {
+  if (status != yajl_status_ok) {
     unsigned char *errmsg;
 
-    errmsg = yajl_get_error (db->yajl, /* verbose = */ 0,
-        /* jsonText = */ NULL, /* jsonTextLen = */ 0);
-    ERROR ("curl_json plugin: yajl_parse_complete failed: %s",
-        (char *) errmsg);
-    yajl_free_error (db->yajl, errmsg);
-    yajl_free (db->yajl);
+    errmsg = yajl_get_error(db->yajl, /* verbose = */ 0,
+                            /* jsonText = */ NULL, /* jsonTextLen = */ 0);
+    ERROR("curl_json plugin: yajl_parse_complete failed: %s", (char *)errmsg);
+    yajl_free_error(db->yajl, errmsg);
+    yajl_free(db->yajl);
     db->yajl = yprev;
-    return (-1);
+    return -1;
   }
 
-  yajl_free (db->yajl);
+  yajl_free(db->yajl);
   db->yajl = yprev;
-  return (0);
+  return 0;
 } /* }}} int cj_perform */
 
-static int cj_read (user_data_t *ud) /* {{{ */
+static int cj_read(user_data_t *ud) /* {{{ */
 {
   cj_t *db;
 
-  if ((ud == NULL) || (ud->data == NULL))
-  {
-    ERROR ("curl_json plugin: cj_read: Invalid user data.");
-    return (-1);
+  if ((ud == NULL) || (ud->data == NULL)) {
+    ERROR("curl_json plugin: cj_read: Invalid user data.");
+    return -1;
   }
 
-  db = (cj_t *) ud->data;
+  db = (cj_t *)ud->data;
 
   db->depth = 0;
-  memset (&db->state, 0, sizeof(db->state));
-  db->state[db->depth].tree = db->tree;
-  db->key = NULL;
+  memset(&db->state, 0, sizeof(db->state));
+
+  /* This is not a compound literal because EPEL6's GCC is not cool enough to
+   * handle anonymous unions within compound literals. */
+  cj_tree_entry_t root = {0};
+  root.type = TREE;
+  root.tree = db->tree;
+  db->state[0].entry = &root;
 
-  return cj_perform (db);
+  int status = cj_perform(db);
+
+  db->state[0].entry = NULL;
+
+  return status;
 } /* }}} int cj_read */
 
-static int cj_init (void) /* {{{ */
+static int cj_init(void) /* {{{ */
 {
   /* Call this while collectd is still single-threaded to avoid
    * initialization issues in libgcrypt. */
-  curl_global_init (CURL_GLOBAL_SSL);
-  return (0);
+  curl_global_init(CURL_GLOBAL_SSL);
+  return 0;
 } /* }}} int cj_init */
 
-void module_register (void)
-{
-  plugin_register_complex_config ("curl_json", cj_config);
-  plugin_register_init ("curl_json", cj_init);
+void module_register(void) {
+  plugin_register_complex_config("curl_json", cj_config);
+  plugin_register_init("curl_json", cj_init);
 } /* void module_register */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */