From: Florian Forster <octo@collectd.org>
Date: Fri, 3 Jul 2015 09:52:50 +0000 (+0200)
Subject: collectdctl: Fix -Wsign-conversion warnings.
X-Git-Tag: collectd-5.6.0~655
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=d1e2c6d468c82c58e24b53a6af18b5d6b599f55d;hp=1e34eeecc5939118e644be5337612a0326781f8e;p=collectd.git

collectdctl: Fix -Wsign-conversion warnings.

Also fixes a shadowed local variable warning.
---

diff --git a/src/collectdctl.c b/src/collectdctl.c
index 8357ce84..febc9983 100644
--- a/src/collectdctl.c
+++ b/src/collectdctl.c
@@ -120,7 +120,7 @@ static int count_chars (const char *str, char chr) {
   return count;
 } /* count_chars */
 
-static int array_grow (void **array, int *array_len, size_t elem_size)
+static int array_grow (void **array, size_t *array_len, size_t elem_size)
 {
   void *tmp;
 
@@ -229,10 +229,10 @@ static int flush (lcc_connection_t *c, int argc, char **argv)
   int timeout = -1;
 
   lcc_identifier_t *identifiers = NULL;
-  int identifiers_num = 0;
+  size_t identifiers_num = 0;
 
   char **plugins = NULL;
-  int plugins_num = 0;
+  size_t plugins_num = 0;
 
   int status;
   int i;
@@ -507,7 +507,7 @@ static int putval (lcc_connection_t *c, int argc, char **argv)
           values_types[values_len] = LCC_TYPE_GAUGE;
         }
         else { /* integer */
-          values[values_len].counter = strtol (value, &endptr, 0);
+          values[values_len].counter = (counter_t) strtoull (value, &endptr, 0);
           values_types[values_len] = LCC_TYPE_COUNTER;
         }
         ++values_len;
@@ -551,14 +551,14 @@ int main (int argc, char **argv) {
   int status;
 
   while (42) {
-    int c;
+    int opt;
 
-    c = getopt (argc, argv, "s:h");
+    opt = getopt (argc, argv, "s:h");
 
-    if (c == -1)
+    if (opt == -1)
       break;
 
-    switch (c) {
+    switch (opt) {
       case 's':
         snprintf (address, sizeof (address), "unix:%s", optarg);
         address[sizeof (address) - 1] = '\0';