author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Sat, 23 Apr 2016 12:05:21 +0000 (14:05 +0200) | ||
committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Sat, 23 Apr 2016 12:05:21 +0000 (14:05 +0200) |
34 files changed:
diff --git a/src/apache.c b/src/apache.c
index 3d25c350fbb366fcfe5569e5f0a3d23bef98e233..2e91a1bee3b6f4311b178e6472350496853f3ec1 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
return (0);
}
- if (len <= 0)
+ if (len == 0)
return (len);
if ((st->apache_buffer_fill + len) >= st->apache_buffer_size)
return (0);
}
- if (len <= 0)
+ if (len == 0)
return (len);
/* look for the Server header */
diff --git a/src/ascent.c b/src/ascent.c
index 74f714a83515c967cc12f3435b9aab969a8fd7c5..9124c26df96fa937215d5c2db40444baab3cda2a 100644 (file)
--- a/src/ascent.c
+++ b/src/ascent.c
@@ -154,7 +154,7 @@ static size_t ascent_curl_callback (void *buf, size_t size, size_t nmemb, /* {{{
{
size_t len = size * nmemb;
- if (len <= 0)
+ if (len == 0)
return (len);
if ((ascent_buffer_fill + len) >= ascent_buffer_size)
diff --git a/src/battery.c b/src/battery.c
index 0350a9eb1dae3b84bffdf84b6ebf2b33a27e48ed..8a96e8990f672e6ba98fed8d7d067dc905254f59 100644 (file)
--- a/src/battery.c
+++ b/src/battery.c
* IOPowerSources. IOKit, on the other hand, only reports the full
* capacity. We use the two to calculate the current charged capacity. */
gauge_t charge_rel = NAN; /* Current charge in percent */
- gauge_t capacity_charged = NAN; /* Charged capacity */
+ gauge_t capacity_charged; /* Charged capacity */
gauge_t capacity_full = NAN; /* Total capacity */
gauge_t capacity_design = NAN; /* Full design capacity */
diff --git a/src/bind.c b/src/bind.c
index 35bb4605d79ef07fd4491ecf9380250b1671bb86..7d26208658b1930f823b9e33c280941e205b85cc 100644 (file)
--- a/src/bind.c
+++ b/src/bind.c
{
size_t len = size * nmemb;
- if (len <= 0)
+ if (len == 0)
return (len);
if ((bind_buffer_fill + len) >= bind_buffer_size)
diff --git a/src/curl.c b/src/curl.c
index ea03ce220915fe041fda430380a7c557b7c64dcb..7f298a2690648ec94ace8cf73a1ccef94937c5a4 100644 (file)
--- a/src/curl.c
+++ b/src/curl.c
size_t len;
len = size * nmemb;
- if (len <= 0)
+ if (len == 0)
return (len);
wp = user_data;
web_page_t *prev;
prev = pages_g;
- while ((prev != NULL) && (prev->next != NULL))
+ while (prev->next != NULL)
prev = prev->next;
prev->next = page;
}
diff --git a/src/curl_json.c b/src/curl_json.c
index 79ae68fced0293ef392fa777385d022d3e9fb0e0..b19730b855a47706be9313740dc685cd4e1ac133 100644 (file)
--- a/src/curl_json.c
+++ b/src/curl_json.c
len = size * nmemb;
- if (len <= 0)
+ if (len == 0)
return (len);
db = user_data;
diff --git a/src/curl_xml.c b/src/curl_xml.c
index fa2f0ca47f3a5f6b901f0789225a2a2058fa6f46..0f2b92b03ffb4eaec0ceb30731f34b15c738b7e2 100644 (file)
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
return (0);
}
- if (len <= 0)
+ if (len == 0)
return (len);
if ((db->buffer_fill + len) >= db->buffer_size)
}
llist_destroy (list);
- list = NULL;
} /* }}} void cx_list_free */
static void cx_free (void *arg) /* {{{ */
diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 6f299174ad8ea38af32fc630d47f208905864dea..2576789cf582704ef58080567f585d31cbe538d6 100644 (file)
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
while ((dirlen > 0) && (dir[dirlen - 1] == '/'))
dir[--dirlen] = '\0';
- if (dirlen <= 0) {
+ if (dirlen == 0) {
free (dir);
return (-1);
}
diff --git a/src/daemon/common.c b/src/daemon/common.c
index 7b7353d96685d60b8bbe8fd951fb35f6e67b13cb..546da3b3f240e94d019e15d20036fca20755fa16 100644 (file)
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
size_t sep_len;
size_t i;
- if ((buffer_size < 1) || (fields_num <= 0))
+ if ((buffer_size < 1) || (fields_num == 0))
return (-1);
memset (buffer, 0, buffer_size);
return ((int) strlen (buffer));
}
-int strsubstitute (char *str, char c_from, char c_to)
-{
- int ret;
-
- if (str == NULL)
- return (-1);
-
- ret = 0;
- while (*str != '\0')
- {
- if (*str == c_from)
- {
- *str = c_to;
- ret++;
- }
- str++;
- }
-
- return (ret);
-} /* int strsubstitute */
-
int escape_string (char *buffer, size_t buffer_size)
{
char *temp;
diff --git a/src/daemon/common.h b/src/daemon/common.h
index c3f7f5485cb5888ed7a95634e538ff9c35b82d46..7b4eb3abfd53bf10a7b4fced80f1c017802f07ed 100644 (file)
--- a/src/daemon/common.h
+++ b/src/daemon/common.h
*/
void replace_special (char *buffer, size_t buffer_size);
-int strsubstitute (char *str, char c_from, char c_to);
-
/*
* NAME
* strunescape
index ca8f15a35fd793d9799016ae594d2544ad5b67d7..68958f3f15271db5b66c64dd189e12e2f1c50073 100644 (file)
--- a/src/daemon/common_test.c
+++ b/src/daemon/common_test.c
EXPECT_EQ_STR ("collectd", ptr);
sfree(ptr);
- OK(ptr == NULL);
ptr = sstrdup (NULL);
OK(ptr == NULL);
diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index 7e905f97456cae24e65950db0055e48a9b80ea6d..fa78fa024af63ab9698411175acc45699b8b0f11 100644 (file)
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
int free_meta_data = 0;
- if ((vl == NULL) || (vl->type[0] == 0)
- || (vl->values == NULL) || (vl->values_len < 1))
+ assert(vl);
+ assert(vl->plugin);
+
+ if (vl->type[0] == 0 || vl->values == NULL || vl->values_len < 1)
{
ERROR ("plugin_dispatch_values: Invalid value list "
"from plugin %s.", vl->plugin);
index 79824a67d4a9d32a19b5e27ebbbe135ad51130db..311cb07bf4c68c007ee9bde15d128dfa13e16d99 100644 (file)
}
sfree (il);
- il = NULL;
} /* void ignorelist_destroy (ignorelist_t *il) */
/*
diff --git a/src/dbi.c b/src/dbi.c
index 36e0d1693e67944957310518ecf2b8c2d79995d3..273cce8e1eae7d5177bcee06bfee08da3ce542eb 100644 (file)
--- a/src/dbi.c
+++ b/src/dbi.c
column_names = NULL;
column_values = NULL;
- res = NULL;
statement = udb_query_get_statement (q);
assert (statement != NULL);
index ca7f958f7e02da6d07dfdb6644b182bb0ea3d420..cfe9c5a1450fb5588c341fca56aadcc8a1f35a2f 100644 (file)
--- a/src/liboconfig/oconfig.c
+++ b/src/liboconfig/oconfig.c
{
oconfig_free_all (ci);
free (ci);
- ci = NULL;
}
/*
diff --git a/src/match_value.c b/src/match_value.c
index fd63ad83c2088312ca390d5ea4215e5f01ea3d51..599f1cfb4bc6863b8432400b25cf18c7b6f2bc33 100644 (file)
--- a/src/match_value.c
+++ b/src/match_value.c
if (m->satisfy == SATISFY_ANY)
break;
}
- else if (value_matches == 0)
+ else
{
status = FC_MATCH_NO_MATCH;
if (m->satisfy == SATISFY_ALL)
diff --git a/src/memcachec.c b/src/memcachec.c
index 1e1d42dcae65dd9414cfbf3dda4f7186c3cc3732..629b99bab12dc9fa5290c3cb8bb34e87ef3d7bb5 100644 (file)
--- a/src/memcachec.c
+++ b/src/memcachec.c
web_page_t *prev;
prev = pages_g;
- while ((prev != NULL) && (prev->next != NULL))
+ while (prev->next != NULL)
prev = prev->next;
prev->next = page;
}
diff --git a/src/memcached.c b/src/memcached.c
index 4e7b1431ba43a23785b1699e8717c822d959f8f3..62ac72a8029dac695632d1a26a3ad40f18ffeca9 100644 (file)
--- a/src/memcached.c
+++ b/src/memcached.c
static int memcached_query_daemon (char *buffer, size_t buffer_size, memcached_t *st)
{
- int fd = -1;
- int status;
+ int fd, status;
size_t buffer_fill;
fd = memcached_connect (st);
diff --git a/src/network.c b/src/network.c
index 3f39aac2d3f8566a0a42d9ab6ed9b47e0767bda0..bf1f2ab6069f61a93443e607ef6821571b5691e3 100644 (file)
--- a/src/network.c
+++ b/src/network.c
uint16_t pkg_length;
size_t payload_size;
- if (output_len <= 0)
+ if (output_len == 0)
return (EINVAL);
if (buffer_len < header_size)
freeaddrinfo (ai_list);
- if (se->data.server.fd_num <= 0)
+ if (se->data.server.fd_num == 0)
return (-1);
return (0);
} /* }}} int sockent_server_listen */
diff --git a/src/nginx.c b/src/nginx.c
index e493cc941560c35b50d684c24cd0ca0edca0dbff..7587c1f9b5b8429f4fb7c5e1b7db0ce04a378f35 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
len = (sizeof (nginx_buffer) - 1) - nginx_buffer_len;
}
- if (len <= 0)
+ if (len == 0)
return (len);
memcpy (&nginx_buffer[nginx_buffer_len], buf, len);
diff --git a/src/olsrd.c b/src/olsrd.c
index 6be7cb583d7f61918bd25254b29723918212c277..6d22d98ad4d4bb9920ef606004864fa4d777f16f 100644 (file)
--- a/src/olsrd.c
+++ b/src/olsrd.c
{
/* An empty line ends the table. */
buffer_len = strchomp (buffer);
- if (buffer_len <= 0)
+ if (buffer_len == 0)
{
(*callback) (lineno, /* fields_num = */ 0, /* fields = */ NULL);
break;
while (fgets (buffer, sizeof (buffer), fh) != NULL)
{
buffer_len = strchomp (buffer);
- if (buffer_len <= 0)
+ if (buffer_len == 0)
continue;
if (strcmp ("Table: Links", buffer) == 0)
diff --git a/src/openvpn.c b/src/openvpn.c
index ec76a7aa66b5f69f749c6add9adfd15adf8187be..85760e996d27b8cd6a6cce3abb531631ad908ab1 100644 (file)
--- a/src/openvpn.c
+++ b/src/openvpn.c
temp->version = status_version;
temp->name = status_name;
- vpn_list = (vpn_status_t **) realloc (vpn_list, (vpn_num + 1) * sizeof (vpn_status_t *));
- if (vpn_list == NULL)
+ vpn_status_t **tmp_list = realloc (vpn_list, (vpn_num + 1) * sizeof (*vpn_list));
+ if (tmp_list == NULL)
{
char errbuf[1024];
ERROR ("openvpn plugin: realloc failed: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
+ sfree (vpn_list);
sfree (temp->file);
sfree (temp);
return (1);
}
+ vpn_list = tmp_list;
vpn_list[vpn_num] = temp;
vpn_num++;
diff --git a/src/perl.c b/src/perl.c
index 27214bb6568acc18796fe913be4d01fa3969d9ef..92a162bd1acb4a1a347f0a324e1d35605e3da64c 100644 (file)
--- a/src/perl.c
+++ b/src/perl.c
static int perl_shutdown (void)
{
- c_ithread_t *t = NULL;
-
- int ret = 0;
+ c_ithread_t *t;
+ int ret;
dTHX;
return 0;
if (NULL == aTHX) {
- t = NULL;
-
pthread_mutex_lock (&perl_threads->mutex);
t = c_ithread_create (perl_threads->head->interp);
pthread_mutex_unlock (&perl_threads->mutex);
diff --git a/src/processes.c b/src/processes.c
index efc64d0125af349a115bdd3c9b2bbcae7f8f30d4..03b44b58d740b0359a8e9dfb876cd6095117dcf1 100644 (file)
--- a/src/processes.c
+++ b/src/processes.c
* strchr(3) and strrchr(3) to avoid pointer arithmetic which would
* otherwise be required to determine name_len. */
name_start_pos = 0;
- while ((buffer[name_start_pos] != '(')
- && (name_start_pos < buffer_len))
+ while (name_start_pos < buffer_len && buffer[name_start_pos] != '(')
name_start_pos++;
name_end_pos = buffer_len;
- while ((buffer[name_end_pos] != ')')
- && (name_end_pos > 0))
+ while (name_end_pos > 0 && buffer[name_end_pos] != ')')
name_end_pos--;
/* Either '(' or ')' is not found or they are in the wrong order.
ps->vmem_code = -1;
DEBUG("ps_read_process: did not get vmem data for pid %li", pid);
}
- if (ps->num_lwp <= 0)
+ if (ps->num_lwp == 0)
ps->num_lwp = 1;
ps->num_proc = 1;
}
buf_ptr += status;
len -= status;
- if (len <= 0)
+ if (len == 0)
break;
}
diff --git a/src/snmp.c b/src/snmp.c
index d6fc05dcaa278d6964f719af14832b0b7dc56ddd..89cbc46016db0610e5e2e6f71f234b2eedcaa495 100644 (file)
--- a/src/snmp.c
+++ b/src/snmp.c
@@ -1673,7 +1673,7 @@ static int csnmp_read_table (host_definition_t *host, data_definition_t *data)
static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
{
struct snmp_pdu *req;
- struct snmp_pdu *res;
+ struct snmp_pdu *res = NULL;
struct variable_list *vb;
const data_set_t *ds;
@@ -1735,7 +1735,6 @@ static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
for (i = 0; i < data->values_len; i++)
snmp_add_null_var (req, data->values[i].oid, data->values[i].oid_len);
- res = NULL;
status = snmp_sess_synch_response (host->sess_handle, req, &res);
if ((status != STAT_SUCCESS) || (res == NULL))
@@ -1748,7 +1747,6 @@ static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
if (res != NULL)
snmp_free_pdu (res);
- res = NULL;
sfree (errstr);
sfree (vl.values);
@@ -1774,9 +1772,7 @@ static int csnmp_read_value (host_definition_t *host, data_definition_t *data)
data->scale, data->shift, host->name, data->name);
} /* for (res->variables) */
- if (res != NULL)
- snmp_free_pdu (res);
- res = NULL;
+ snmp_free_pdu (res);
DEBUG ("snmp plugin: -> plugin_dispatch_values (&vl);");
plugin_dispatch_values (&vl);
diff --git a/src/threshold.c b/src/threshold.c
index 624ab7a91dd7c14b7112e9c2884bff46c636f8d1..e849b1d8b921fd2da5d7d1f3f98eaf20d7a07e2a 100644 (file)
--- a/src/threshold.c
+++ b/src/threshold.c
return (-1);
}
memcpy (th_copy, th, sizeof (threshold_t));
- th_ptr = NULL;
DEBUG ("ut_threshold_add: Adding entry `%s'", name);
diff --git a/src/utils_db_query.c b/src/utils_db_query.c
index 5c5d1d775a48bcda03ff89084cdad16855fb749d..91fc1421860a03987104b2c89c456fabf0b01fda 100644 (file)
--- a/src/utils_db_query.c
+++ b/src/utils_db_query.c
assert (((size_t) r_area->ds->ds_num) == r->values_num);
assert (r->values_num > 0);
- vl.values = (value_t *) calloc (r->values_num, sizeof (value_t));
+ vl.values = calloc (r->values_num, sizeof (*vl.values));
if (vl.values == NULL)
{
ERROR ("db query utils: calloc failed.");
ERROR ("db query utils: udb_result_submit: Parsing `%s' as %s failed.",
value_str, DS_TYPE_TO_STRING (r_area->ds->ds[i].type));
errno = EINVAL;
+ free (vl.values);
return (-1);
}
}
sstrncpy (vl.type, r->type, sizeof (vl.type));
/* Set vl.type_instance {{{ */
- if (r->instances_num <= 0)
+ if (r->instances_num == 0)
{
if (r->instance_prefix == NULL)
vl.type_instance[0] = 0;
index 2c0e4cd029b3f29c3b05521f1171541c9f591679..800b4219109b6070b64157620bb97fb6c5a17a70 100644 (file)
--- a/src/utils_format_json.c
+++ b/src/utils_format_json.c
}
} /* for (keys) */
- if (offset <= 0)
+ if (offset == 0)
return (ENOENT);
buffer[0] = '{'; /* replace leading ',' */
diff --git a/src/utils_rrdcreate.c b/src/utils_rrdcreate.c
index fb04201cedd4f3b886eeb67447585886346db8bf..2012b849c8dea9dabdc569e5268d6efe5696949f 100644 (file)
--- a/src/utils_rrdcreate.c
+++ b/src/utils_rrdcreate.c
return (-1);
}
- if (ds_num <= 0)
+ if (ds_num == 0)
{
sfree (ds_def);
return (0);
diff --git a/src/write_graphite.c b/src/write_graphite.c
index 0fa8bc326a742d2a26c1249d7f5de8bebe2ecbe5..0b8ab41c08bf10681c04987fd37c946c2dcb3a4c 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
return (0);
}
- if (cb->send_buf_fill <= 0)
+ if (cb->send_buf_fill == 0)
{
cb->send_buf_init_time = cdtime ();
return (0);
diff --git a/src/write_http.c b/src/write_http.c
index 9a4051176bf9c40bba5c9f877d838727f9c17283..8dd37c45ad189e2dfbf4265410d37a5b96382bb6 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
if (cb->format == WH_FORMAT_COMMAND)
{
- if (cb->send_buffer_fill <= 0)
+ if (cb->send_buffer_fill == 0)
{
cb->send_buffer_init_time = cdtime ();
return (0);
diff --git a/src/write_tsdb.c b/src/write_tsdb.c
index 0fa6245212fa5311c535b16c9eebec40ff4666c0..46028ba161b558e357641577a3e2daff14b79cc2 100644 (file)
--- a/src/write_tsdb.c
+++ b/src/write_tsdb.c
return 0;
}
- if (cb->send_buf_fill <= 0)
+ if (cb->send_buf_fill == 0)
{
cb->send_buf_init_time = cdtime();
return 0;
diff --git a/src/zone.c b/src/zone.c
index 52dc55395bbd4edfc9d9eca1ad7ab636ffec15b7..0e9fee386f8c47749da5d320f407dfce4a56a545 100644 (file)
--- a/src/zone.c
+++ b/src/zone.c
}
if (!(key = malloc(sizeof(*key)))) {
WARNING("zone plugin: no memory");
+ free(ret);
return(NULL);
}
*key = zoneid;
diff --git a/src/zookeeper.c b/src/zookeeper.c
index 1eed1fb35d1b02281ea050cc12d9cffa250e2270..89ec6d267dd9c98f7a6a1b3d0401578e4343bd65 100644 (file)
--- a/src/zookeeper.c
+++ b/src/zookeeper.c
static int zookeeper_query (char *buffer, size_t buffer_size)
{
- int sk = -1;
- int status;
+ int sk, status;
size_t buffer_fill;
sk = zookeeper_connect();