X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcurl.c;h=7f298a2690648ec94ace8cf73a1ccef94937c5a4;hb=da42acdb9cee2aa6cc311c5ac730a8991ba35113;hp=5f782074d3251d0e6fc132974c818f8ee84aec55;hpb=e2fc27cdb088daf9fde56109f45ae32f9ab42607;p=collectd.git diff --git a/src/curl.c b/src/curl.c index 5f782074..7f298a26 100644 --- a/src/curl.c +++ b/src/curl.c @@ -95,7 +95,7 @@ static size_t cc_curl_callback (void *buf, /* {{{ */ size_t len; len = size * nmemb; - if (len <= 0) + if (len == 0) return (len); wp = user_data; @@ -108,7 +108,7 @@ static size_t cc_curl_callback (void *buf, /* {{{ */ 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."); @@ -167,16 +167,19 @@ static void cc_web_page_free (web_page_t *wp) /* {{{ */ static int cc_config_append_string (const char *name, struct curl_slist **dest, /* {{{ */ oconfig_item_t *ci) { + struct curl_slist *temp = NULL; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) { WARNING ("curl plugin: `%s' needs exactly one string argument.", name); return (-1); } - *dest = curl_slist_append(*dest, ci->values[0].value.string); - if (*dest == NULL) + temp = curl_slist_append(*dest, ci->values[0].value.string); + if (temp == NULL) return (-1); + *dest = temp; + return (0); } /* }}} int cc_config_append_string */ @@ -540,7 +543,7 @@ static int cc_config_add_page (oconfig_item_t *ci) /* {{{ */ web_page_t *prev; prev = pages_g; - while ((prev != NULL) && (prev->next != NULL)) + while (prev->next != NULL) prev = prev->next; prev->next = page; }