projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
command parser: Add a vector-based interface.
[collectd.git]
/
src
/
curl.c
diff --git
a/src/curl.c
b/src/curl.c
index
d9ced60
..
8401e6c
100644
(file)
--- a/
src/curl.c
+++ b/
src/curl.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_curl_stats.h"
#include "utils_match.h"
#include "utils_time.h"
#include "utils_curl_stats.h"
#include "utils_match.h"
#include "utils_time.h"
@@
-269,7
+269,6
@@
static int cc_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)
{
@@
-284,7
+283,7
@@
static int cc_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;
@@
-433,7
+432,6
@@
static int cc_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))
{
@@
-468,7
+466,7
@@
static int cc_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;
@@
-566,12
+564,11
@@
static int cc_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;
@@
-611,14
+608,11
@@
static int cc_init (void) /* {{{ */
} /* }}} int cc_init */
static void cc_submit (const web_page_t *wp, const web_match_t *wm, /* {{{ */
} /* }}} int cc_init */
static void cc_submit (const web_page_t *wp, const web_match_t *wm, /* {{{ */
-
const cu_match_value_t *mv
)
+
value_t value
)
{
{
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- values[0] = mv->value;
-
- vl.values = values;
+ vl.values = &value;
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "curl", sizeof (vl.plugin));
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "curl", sizeof (vl.plugin));
@@
-632,12
+626,9
@@
static void cc_submit (const web_page_t *wp, const web_match_t *wm, /* {{{ */
static void cc_submit_response_code (const web_page_t *wp, long code) /* {{{ */
{
static void cc_submit_response_code (const web_page_t *wp, long code) /* {{{ */
{
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = code;
-
- vl.values = values;
+ vl.values = &(value_t) { .gauge = (gauge_t) code };
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "curl", sizeof (vl.plugin));
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "curl", sizeof (vl.plugin));
@@
-650,12
+641,9
@@
static void cc_submit_response_code (const web_page_t *wp, long code) /* {{{ */
static void cc_submit_response_time (const web_page_t *wp, /* {{{ */
cdtime_t response_time)
{
static void cc_submit_response_time (const web_page_t *wp, /* {{{ */
cdtime_t response_time)
{
- value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = CDTIME_T_TO_DOUBLE (response_time);
-
- vl.values = values;
+ vl.values = &(value_t) { .gauge = CDTIME_T_TO_DOUBLE (response_time) };
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "curl", sizeof (vl.plugin));
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
sstrncpy (vl.plugin, "curl", sizeof (vl.plugin));
@@
-667,7
+655,6
@@
static void cc_submit_response_time (const web_page_t *wp, /* {{{ */
static int cc_read_page (web_page_t *wp) /* {{{ */
{
static int cc_read_page (web_page_t *wp) /* {{{ */
{
- web_match_t *wm;
int status;
cdtime_t start = 0;
int status;
cdtime_t start = 0;
@@
-700,7
+687,7
@@
static int cc_read_page (web_page_t *wp) /* {{{ */
}
}
}
}
- 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;
@@
-718,7
+705,7
@@
static int cc_read_page (web_page_t *wp) /* {{{ */
continue;
}
continue;
}
- cc_submit (wp, wm, mv);
+ cc_submit (wp, wm, mv
->value
);
match_value_reset (mv);
} /* for (wm = wp->matches; wm != NULL; wm = wm->next) */
match_value_reset (mv);
} /* for (wm = wp->matches; wm != NULL; wm = wm->next) */
@@
-727,9
+714,7
@@
static int cc_read_page (web_page_t *wp) /* {{{ */
static int cc_read (void) /* {{{ */
{
static int cc_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)
cc_read_page (wp);
return (0);
cc_read_page (wp);
return (0);