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'
[collectd.git]
/
src
/
curl_json.c
diff --git
a/src/curl_json.c
b/src/curl_json.c
index
3ba5560
..
510d9b6
100644
(file)
--- a/
src/curl_json.c
+++ b/
src/curl_json.c
@@
-28,7
+28,6
@@
#include "utils_avltree.h"
#include "utils_complain.h"
#include "utils_avltree.h"
#include "utils_complain.h"
-#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
#include <sys/types.h>
#include <sys/un.h>
@@
-563,7
+562,7
@@
static int cj_config_add_key (cj_t *db, /* {{{ */
if (*ptr == '/')
{
c_avl_tree_t *value;
if (*ptr == '/')
{
c_avl_tree_t *value;
-
in
t len;
+
size_
t len;
len = ptr-name;
if (len == 0)
len = ptr-name;
if (len == 0)
@@
-655,11
+654,9
@@
static int cj_init_curl (cj_t *db) /* {{{ */
if (db->timeout >= 0)
curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout);
else if (db->interval > 0)
if (db->timeout >= 0)
curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) db->timeout);
else if (db->interval > 0)
- curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS,
- CDTIME_T_TO_MS(db->timeout));
+ curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) CDTIME_T_TO_MS(db->timeout));
else
else
- curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS,
- CDTIME_T_TO_MS(plugin_get_interval()));
+ curl_easy_setopt (db->curl, CURLOPT_TIMEOUT_MS, (long) CDTIME_T_TO_MS(plugin_get_interval()));
#endif
return (0);
#endif
return (0);
@@
-764,9
+761,6
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
{
user_data_t ud;
char *cb_name;
{
user_data_t ud;
char *cb_name;
- struct timespec interval = { 0, 0 };
-
- CDTIME_T_TO_TIMESPEC (db->interval, &interval);
if (db->instance == NULL)
db->instance = strdup("default");
if (db->instance == NULL)
db->instance = strdup("default");
@@
-782,7
+776,7
@@
static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */
db->instance, db->url ? db->url : db->sock);
plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read,
db->instance, db->url ? db->url : db->sock);
plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read,
- /* interval = */
(db->interval > 0) ? &interval : NULL
,
+ /* interval = */
db->interval
,
&ud);
sfree (cb_name);
}
&ud);
sfree (cb_name);
}