Merge branch 'cppcheck'

diff --combined src/apache.c
index 3d25c35,0db5328..2e91a1b
--- 1/src/apache.c
--- 2/src/apache.c
+++ b/src/apache.c
@@@ -98,14 -98,14 +98,14 @@@ static size_t apache_curl_callback (voi
                return (0);
        }
  
-       if (len <= 0)
+       if (len == 0)
                return (len);
  
        if ((st->apache_buffer_fill + len) >= st->apache_buffer_size)
        {
                char *temp;
  
 -              temp = (char *) realloc (st->apache_buffer,
 +              temp = realloc (st->apache_buffer,
                                st->apache_buffer_fill + len + 1);
                if (temp == NULL)
                {
@@@ -137,7 -137,7 +137,7 @@@ static size_t apache_header_callback (v
                return (0);
        }
  
-       if (len <= 0)
+       if (len == 0)
                return (len);
  
        /* look for the Server header */

diff --combined src/ascent.c
index 74f714a,26f3a11..9124c26
--- 1/src/ascent.c
--- 2/src/ascent.c
+++ b/src/ascent.c
@@@ -154,14 -154,14 +154,14 @@@ static size_t ascent_curl_callback (voi
  {
    size_t len = size * nmemb;
  
-   if (len <= 0)
+   if (len == 0)
      return (len);
  
    if ((ascent_buffer_fill + len) >= ascent_buffer_size)
    {
      char *temp;
  
 -    temp = (char *) realloc (ascent_buffer,
 +    temp = realloc (ascent_buffer,
          ascent_buffer_fill + len + 1);
      if (temp == NULL)
      {

diff --combined src/bind.c
index 35bb460,e6855d2..7d26208
--- 1/src/bind.c
--- 2/src/bind.c
+++ b/src/bind.c
@@@ -277,14 -277,14 +277,14 @@@ static size_t bind_curl_callback (void 
  {
    size_t len = size * nmemb;
  
-   if (len <= 0)
+   if (len == 0)
      return (len);
  
    if ((bind_buffer_fill + len) >= bind_buffer_size)
    {
      char *temp;
  
 -    temp = realloc(bind_buffer, bind_buffer_fill + len + 1);
 +    temp = realloc (bind_buffer, bind_buffer_fill + len + 1);
      if (temp == NULL)
      {
        ERROR ("bind plugin: realloc failed.");
@@@ -1613,7 -1613,7 +1613,7 @@@ static int bind_config_add_view_zone (c
      return (-1);
    }
  
 -  tmp = (char **) realloc (view->zones,
 +  tmp = realloc (view->zones,
        sizeof (char *) * (view->zones_num + 1));
    if (tmp == NULL)
    {
@@@ -1644,7 -1644,7 +1644,7 @@@ static int bind_config_add_view (oconfi
      return (-1);
    }
  
 -  tmp = (cb_view_t *) realloc (views, sizeof (*views) * (views_num + 1));
 +  tmp = realloc (views, sizeof (*views) * (views_num + 1));
    if (tmp == NULL)
    {
      ERROR ("bind plugin: realloc failed.");

diff --combined src/curl.c
index ea03ce2,310561c..7f298a2
--- 1/src/curl.c
--- 2/src/curl.c
+++ b/src/curl.c
@@@ -95,7 -95,7 +95,7 @@@ static size_t cc_curl_callback (void *b
    size_t len;
  
    len = size * nmemb;
-   if (len <= 0)
+   if (len == 0)
      return (len);
  
    wp = user_data;
@@@ -108,7 -108,7 +108,7 @@@
      size_t temp_size;
  
      temp_size = wp->buffer_fill + len + 1;
 -    temp = (char *) realloc (wp->buffer, temp_size);
 +    temp = realloc (wp->buffer, temp_size);
      if (temp == NULL)
      {
        ERROR ("curl plugin: realloc failed.");
@@@ -543,7 -543,7 +543,7 @@@ static int cc_config_add_page (oconfig_
      web_page_t *prev;
  
      prev = pages_g;
-     while ((prev != NULL) && (prev->next != NULL))
+     while (prev->next != NULL)
        prev = prev->next;
      prev->next = page;
    }

diff --combined src/curl_xml.c
index fa2f0ca,4948886..0f2b92b
--- 1/src/curl_xml.c
--- 2/src/curl_xml.c
+++ b/src/curl_xml.c
@@@ -114,14 -114,14 +114,14 @@@ static size_t cx_curl_callback (void *b
      return (0);
    }
  
-    if (len <= 0)
+    if (len == 0)
      return (len);
  
    if ((db->buffer_fill + len) >= db->buffer_size)
    {
      char *temp;
  
 -    temp = (char *) realloc (db->buffer,
 +    temp = realloc (db->buffer,
                      db->buffer_fill + len + 1);
      if (temp == NULL)
      {
@@@ -170,7 -170,6 +170,6 @@@ static void cx_list_free (llist_t *list
    }
  
    llist_destroy (list);
-   list = NULL;
  } /* }}} void cx_list_free */
  
  static void cx_free (void *arg) /* {{{ */

diff --combined src/dbi.c
index 36e0d16,6e98168..273cce8
--- 1/src/dbi.c
--- 2/src/dbi.c
+++ b/src/dbi.c
@@@ -240,7 -240,7 +240,7 @@@ static int cdbi_config_add_database_dri
      return (-1);
    }
  
 -  option = (cdbi_driver_option_t *) realloc (db->driver_options,
 +  option = realloc (db->driver_options,
        sizeof (*option) * (db->driver_options_num + 1));
    if (option == NULL)
    {
@@@ -386,7 -386,7 +386,7 @@@ static int cdbi_config_add_database (oc
    {
      cdbi_database_t **temp;
  
 -    temp = (cdbi_database_t **) realloc (databases,
 +    temp = realloc (databases,
          sizeof (*databases) * (databases_num + 1));
      if (temp == NULL)
      {
@@@ -510,7 -510,6 +510,6 @@@ static int cdbi_read_database_query (cd
  
    column_names = NULL;
    column_values = NULL;
-   res = NULL;
  
    statement = udb_query_get_statement (q);
    assert (statement != NULL);

diff --combined src/match_value.c
index fd63ad8,fbe1f03..599f1cf
--- 1/src/match_value.c
--- 2/src/match_value.c
+++ b/src/match_value.c
@@@ -129,7 -129,7 +129,7 @@@ static int mv_config_add_data_source (m
  
    /* Allocate space for the char pointers */
    new_data_sources_num = m->data_sources_num + ((size_t) ci->values_num);
 -  temp = (char **) realloc (m->data_sources,
 +  temp = realloc (m->data_sources,
        new_data_sources_num * sizeof (char *));
    if (temp == NULL)
    {
@@@ -335,7 -335,7 +335,7 @@@ static int mv_match (const data_set_t *
        if (m->satisfy == SATISFY_ANY)
          break;
      }
-     else if (value_matches == 0)
+     else
      {
        status = FC_MATCH_NO_MATCH;
        if (m->satisfy == SATISFY_ALL)

diff --combined src/perl.c
index 27214bb,ee0f541..92a162b
--- 1/src/perl.c
--- 2/src/perl.c
+++ b/src/perl.c
@@@ -2064,9 -2064,8 +2064,8 @@@ static int perl_flush (cdtime_t timeout
  
  static int perl_shutdown (void)
  {
-       c_ithread_t *t = NULL;
- 
-       int ret = 0;
+       c_ithread_t *t;
+       int ret;
  
        dTHX;
  
@@@ -2076,8 -2075,6 +2075,6 @@@
                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);
@@@ -2382,7 -2379,7 +2379,7 @@@ static int perl_config_enabledebugger (
  
        value = ci->values[0].value.string;
  
 -      perl_argv = (char **)realloc (perl_argv,
 +      perl_argv = realloc (perl_argv,
                        (++perl_argc + 1) * sizeof (char *));
  
        if (NULL == perl_argv) {
@@@ -2419,7 -2416,7 +2416,7 @@@ static int perl_config_includedir (pTHX
        value = ci->values[0].value.string;
  
        if (NULL == aTHX) {
 -              perl_argv = (char **)realloc (perl_argv,
 +              perl_argv = realloc (perl_argv,
                                (++perl_argc + 1) * sizeof (char *));
  
                if (NULL == perl_argv) {

diff --combined src/snmp.c
index d6fc05d,4f4be12..89cbc46
--- 1/src/snmp.c
--- 2/src/snmp.c
+++ b/src/snmp.c
@@@ -520,7 -520,7 +520,7 @@@ static int csnmp_config_add_host_collec
      }
  
    data_list_len = host->data_list_len + ci->values_num;
 -  data_list = (data_definition_t **) realloc (host->data_list,
 +  data_list = realloc (host->data_list,
        sizeof (data_definition_t *) * data_list_len);
    if (data_list == NULL)
      return (-1);
@@@ -1673,7 -1673,7 +1673,7 @@@ static int csnmp_read_table (host_defin
  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 +1735,6 @@@
    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 +1747,6 @@@
  
      if (res != NULL)
        snmp_free_pdu (res);
-     res = NULL;
  
      sfree (errstr);
      sfree (vl.values);
@@@ -1774,9 -1772,7 +1772,7 @@@
              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 --combined src/utils_db_query.c
index 5c5d1d7,448b82b..91fc142
--- 1/src/utils_db_query.c
--- 2/src/utils_db_query.c
+++ b/src/utils_db_query.c
@@@ -142,7 -142,7 +142,7 @@@ static int udb_config_add_string (char 
    }
  
    array_len = *ret_array_len;
 -  array = (char **) realloc (*ret_array,
 +  array = realloc (*ret_array,
        sizeof (char *) * (array_len + ci->values_num));
    if (array == NULL)
    {
@@@ -204,7 -204,7 +204,7 @@@ static int udb_result_submit (udb_resul
    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.");
@@@ -221,6 -221,7 +221,7 @@@
        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);
      }
    }
@@@ -234,7 -235,7 +235,7 @@@
    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;
@@@ -750,7 -751,7 +751,7 @@@ int udb_query_create (udb_query_t ***re
    {
      udb_query_t **temp;
  
 -    temp = (udb_query_t **) realloc (query_list,
 +    temp = realloc (query_list,
          sizeof (*query_list) * (query_list_len + 1));
      if (temp == NULL)
      {
@@@ -815,7 -816,7 +816,7 @@@ int udb_query_pick_from_list_by_name (c
        continue;
  
      tmp_list_len = *dst_list_len;
 -    tmp_list = (udb_query_t **) realloc (*dst_list, (tmp_list_len + 1)
 +    tmp_list = realloc (*dst_list, (tmp_list_len + 1)
          * sizeof (udb_query_t *));
      if (tmp_list == NULL)
      {