Merge branch 'collectd-5.7' into collectd-5.8

[collectd.git] / src / zookeeper.c

diff --git a/src/zookeeper.c b/src/zookeeper.c
index 37aac80..0b2507d 100644 (file)
--- a/src/zookeeper.c
+++ b/src/zookeeper.c
@@ -57,15 +57,11 @@ static int zookeeper_config(const char *key, const char *value) {
 }
 
 static void zookeeper_submit_gauge(const char *type, const char *type_inst,
-                                   gauge_t val) {
-  value_t values[1];
+                                   gauge_t value) {
   value_list_t vl = VALUE_LIST_INIT;
 
-  values[0].gauge = val;
-
-  vl.values = values;
+  vl.values = &(value_t){.gauge = value};
   vl.values_len = 1;
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "zookeeper", sizeof(vl.plugin));
   sstrncpy(vl.type, type, sizeof(vl.type));
   if (type_inst != NULL)
@@ -75,15 +71,11 @@ static void zookeeper_submit_gauge(const char *type, const char *type_inst,
 } /* zookeeper_submit_gauge */
 
 static void zookeeper_submit_derive(const char *type, const char *type_inst,
-                                    derive_t val) {
-  value_t values[1];
+                                    derive_t value) {
   value_list_t vl = VALUE_LIST_INIT;
 
-  values[0].derive = val;
-
-  vl.values = values;
+  vl.values = &(value_t){.derive = value};
   vl.values_len = 1;
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "zookeeper", sizeof(vl.plugin));
   sstrncpy(vl.type, type, sizeof(vl.type));
   if (type_inst != NULL)
@@ -111,7 +103,7 @@ static int zookeeper_connect(void) {
     INFO("getaddrinfo failed: %s",
          (status == EAI_SYSTEM) ? sstrerror(errno, errbuf, sizeof(errbuf))
                                 : gai_strerror(status));
-    return (-1);
+    return -1;
   }
 
   for (struct addrinfo *ai = ai_list; ai != NULL; ai = ai->ai_next) {
@@ -137,7 +129,7 @@ static int zookeeper_connect(void) {
   }
 
   freeaddrinfo(ai_list);
-  return (sk);
+  return sk;
 } /* int zookeeper_connect */
 
 static int zookeeper_query(char *buffer, size_t buffer_size) {
@@ -147,7 +139,7 @@ static int zookeeper_query(char *buffer, size_t buffer_size) {
   sk = zookeeper_connect();
   if (sk < 0) {
     ERROR("zookeeper: Could not connect to daemon");
-    return (-1);
+    return -1;
   }
 
   status = (int)swrite(sk, "mntr\r\n", strlen("mntr\r\n"));
@@ -156,7 +148,7 @@ static int zookeeper_query(char *buffer, size_t buffer_size) {
     ERROR("zookeeper: write(2) failed: %s",
           sstrerror(errno, errbuf, sizeof(errbuf)));
     close(sk);
-    return (-1);
+    return -1;
   }
 
   memset(buffer, 0, buffer_size);
@@ -172,7 +164,7 @@ static int zookeeper_query(char *buffer, size_t buffer_size) {
       ERROR("zookeeper: Error reading from socket: %s",
             sstrerror(errno, errbuf, sizeof(errbuf)));
       close(sk);
-      return (-1);
+      return -1;
     }
 
     buffer_fill += (size_t)status;
@@ -185,7 +177,7 @@ static int zookeeper_query(char *buffer, size_t buffer_size) {
   }
 
   close(sk);
-  return (status);
+  return status;
 } /* int zookeeper_query */
 
 static int zookeeper_read(void) {
@@ -196,7 +188,7 @@ static int zookeeper_read(void) {
   char *fields[2];
 
   if (zookeeper_query(buf, sizeof(buf)) < 0) {
-    return (-1);
+    return -1;
   }
 
   ptr = buf;
@@ -246,7 +238,7 @@ static int zookeeper_read(void) {
     }
   }
 
-  return (0);
+  return 0;
 } /* zookeeper_read */
 
 void module_register(void) {