X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fceph.c;h=b1ca3b66649dce4d6e086910b89ef13f534a7d2c;hb=591c55cdb4e56f229d27d93a28a75e8a506def15;hp=251def9cd66ae1f21dd23c13eafd827f9f9fd0f0;hpb=e5a9d9dee9e5ad0d47a68723bb7aa33b65355214;p=collectd.git

diff --git a/src/ceph.c b/src/ceph.c
index 251def9c..b1ca3b66 100644
--- a/src/ceph.c
+++ b/src/ceph.c
@@ -45,7 +45,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/un.h>
@@ -97,7 +96,7 @@ enum ceph_dset_type_d
 };
 
 /** Valid types for ceph defined in types.db */
-const char * ceph_dset_types [CEPH_DSET_TYPES_NUM] =
+static const char * const ceph_dset_types [CEPH_DSET_TYPES_NUM] =
                                    {"ceph_latency", "ceph_bytes", "ceph_rate"};
 
 /******* ceph_daemon *******/
@@ -1097,7 +1096,7 @@ static int cconn_connect(struct cconn *io)
     fd = socket(PF_UNIX, SOCK_STREAM, 0);
     if(fd < 0)
     {
-        int err = -errno;
+        err = -errno;
         ERROR("ceph plugin: cconn_connect: socket(PF_UNIX, SOCK_STREAM, 0) "
             "failed: error %d", err);
         return err;
@@ -1546,7 +1545,7 @@ static int cconn_main_loop(uint32_t request_type)
             }
             else
             {
-                int ret = cconn_handle_event(io);
+                ret = cconn_handle_event(io);
                 if(ret)
                 {
                     WARNING("ceph plugin: cconn_handle_event(name=%s,"