eliminated warnings identified by coverity

diff --git a/src/plugin_nfacct.c b/src/plugin_nfacct.c
index 2213ebb24e1caac646ebfa3f2ec5178e02b5ef7a..4c691be055eab6b5eb0065b55f59d27a528cf52d 100644 (file)
--- a/src/plugin_nfacct.c
+++ b/src/plugin_nfacct.c
@@ -5,6 +5,11 @@
 #ifdef HAVE_LIBMNL
 #include <libmnl/libmnl.h>
 
+static inline size_t mnl_buffer_size() {
+    long s = MNL_SOCKET_BUFFER_SIZE;
+    if(s <= 0) return 8192;
+    return (size_t)s;
+}
 
 // ----------------------------------------------------------------------------
 // DO_NFSTAT - collect netfilter connection tracker statistics via netlink
@@ -74,7 +79,7 @@ static struct {
 static int nfstat_init(int update_every) {
     nfstat_root.update_every = update_every;
 
-    nfstat_root.buf_size = (size_t)MNL_SOCKET_BUFFER_SIZE;
+    nfstat_root.buf_size = mnl_buffer_size();
     nfstat_root.buf = mallocz(nfstat_root.buf_size);
 
     nfstat_root.mnl  = mnl_socket_open(NETLINK_NETFILTER);
@@ -534,7 +539,7 @@ static inline struct nfacct_data *nfacct_data_get(const char *name, uint32_t has
 static int nfacct_init(int update_every) {
     nfacct_root.update_every = update_every;
 
-    nfacct_root.buf_size = (size_t)MNL_SOCKET_BUFFER_SIZE;
+    nfacct_root.buf_size = mnl_buffer_size();
     nfacct_root.buf = mallocz(nfacct_root.buf_size);
 
     nfacct_root.nfacct_buffer = nfacct_alloc();

diff --git a/src/rrdhost.c b/src/rrdhost.c
index 81ff96f892415a82a80f6a2ff2f330203a8e9caa..a2310330d2ec0fdf27507a253039bfe333f38d69 100644 (file)
--- a/src/rrdhost.c
+++ b/src/rrdhost.c
@@ -97,7 +97,7 @@ RRDHOST *rrdhost_create(const char *hostname,
 
     RRDHOST *host = callocz(1, sizeof(RRDHOST));
 
-    host->rrd_update_every    = update_every;
+    host->rrd_update_every    = (update_every > 0)?update_every:1;
     host->rrd_history_entries = align_entries_to_pagesize(memory_mode, entries);
     host->rrd_memory_mode     = memory_mode;
     host->health_enabled      = (memory_mode == RRD_MEMORY_MODE_NONE)? 0 : health_enabled;