projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5' into collectd-5.6
[collectd.git]
/
src
/
memcachec.c
diff --git
a/src/memcachec.c
b/src/memcachec.c
index
d7e6c28
..
dff5546
100644
(file)
--- a/
src/memcachec.c
+++ b/
src/memcachec.c
@@
-22,9
+22,9
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include "utils_match.h"
#include <libmemcached/memcached.h>
#include "utils_match.h"
#include <libmemcached/memcached.h>
@@
-199,7
+199,6
@@
static int cmc_config_add_match (web_page_t *page, /* {{{ */
{
web_match_t *match;
int status;
{
web_match_t *match;
int status;
- int i;
if (ci->values_num != 0)
{
if (ci->values_num != 0)
{
@@
-214,7
+213,7
@@
static int cmc_config_add_match (web_page_t *page, /* {{{ */
}
status = 0;
}
status = 0;
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-296,7
+295,6
@@
static int cmc_config_add_page (oconfig_item_t *ci) /* {{{ */
{
web_page_t *page;
int status;
{
web_page_t *page;
int status;
- int i;
if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
{
if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
{
@@
-323,7
+321,7
@@
static int cmc_config_add_page (oconfig_item_t *ci) /* {{{ */
/* Process all children */
status = 0;
/* Process all children */
status = 0;
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-400,12
+398,11
@@
static int cmc_config (oconfig_item_t *ci) /* {{{ */
int success;
int errors;
int status;
int success;
int errors;
int status;
- int i;
success = 0;
errors = 0;
success = 0;
errors = 0;
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-464,7
+461,6
@@
static void cmc_submit (const web_page_t *wp, const web_match_t *wm, /* {{{ */
static int cmc_read_page (web_page_t *wp) /* {{{ */
{
static int cmc_read_page (web_page_t *wp) /* {{{ */
{
- web_match_t *wm;
memcached_return rc;
size_t string_length;
uint32_t flags;
memcached_return rc;
size_t string_length;
uint32_t flags;
@@
-482,7
+478,7
@@
static int cmc_read_page (web_page_t *wp) /* {{{ */
return (-1);
}
return (-1);
}
- for (wm = wp->matches; wm != NULL; wm = wm->next)
+ for (w
eb_match_t *w
m = wp->matches; wm != NULL; wm = wm->next)
{
cu_match_value_t *mv;
{
cu_match_value_t *mv;
@@
-511,9
+507,7
@@
static int cmc_read_page (web_page_t *wp) /* {{{ */
static int cmc_read (void) /* {{{ */
{
static int cmc_read (void) /* {{{ */
{
- web_page_t *wp;
-
- for (wp = pages_g; wp != NULL; wp = wp->next)
+ for (web_page_t *wp = pages_g; wp != NULL; wp = wp->next)
cmc_read_page (wp);
return (0);
cmc_read_page (wp);
return (0);