Code

backends, daemon: Don't shadow global 'socket' and 'daemon' symbols.
[sysdb.git] / src / backend / collectd.c
index f745fc9316d66e9849c219c4ebe2e1d3769a78a9..e0e924e2c959e946f7e645a6879aba0be5ede13c 100644 (file)
@@ -294,7 +294,7 @@ static int
 sdb_collectd_config_instance(oconfig_item_t *ci)
 {
        char *name = NULL;
-       char *socket = NULL;
+       char *socket_path = NULL;
 
        char cb_name[1024];
 
@@ -313,14 +313,14 @@ sdb_collectd_config_instance(oconfig_item_t *ci)
                oconfig_item_t *child = ci->children + i;
 
                if (! strcasecmp(child->key, "Socket"))
-                       oconfig_get_string(child, &socket);
+                       oconfig_get_string(child, &socket_path);
                else
                        fprintf(stderr, "collectd backend: Ignoring unknown config "
                                        "option '%s' inside <Instance %s>.\n",
                                        child->key, name);
        }
 
-       if (! socket) {
+       if (! socket_path) {
                fprintf(stderr, "collectd backend: Instance '%s' missing "
                                "the 'Socket' option.\n", name);
                return -1;
@@ -329,7 +329,7 @@ sdb_collectd_config_instance(oconfig_item_t *ci)
        snprintf(cb_name, sizeof(cb_name), "collectd-%s", name);
        cb_name[sizeof(cb_name) - 1] = '\0';
 
-       client = sdb_unixsock_client_create(socket);
+       client = sdb_unixsock_client_create(socket_path);
        if (! client) {
                char errbuf[1024];
                fprintf(stderr, "collectd backend: Failed to create unixsock client: "