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.8'
[collectd.git]
/
src
/
curl_json.c
diff --git
a/src/curl_json.c
b/src/curl_json.c
index
756f24f
..
f0badc9
100644
(file)
--- a/
src/curl_json.c
+++ b/
src/curl_json.c
@@
-74,7
+74,7
@@
typedef struct {
* exists for this part of the JSON structure. */
typedef struct {
cj_tree_entry_t *entry;
* exists for this part of the JSON structure. */
typedef struct {
cj_tree_entry_t *entry;
-
_B
ool in_array;
+
b
ool in_array;
int index;
char name[DATA_MAX_NAME_LEN];
} cj_state_t;
int index;
char name[DATA_MAX_NAME_LEN];
} cj_state_t;
@@
-91,9
+91,9
@@
struct cj_s /* {{{ */
char *user;
char *pass;
char *credentials;
char *user;
char *pass;
char *credentials;
-
_B
ool digest;
-
_B
ool verify_peer;
-
_B
ool verify_host;
+
b
ool digest;
+
b
ool verify_peer;
+
b
ool verify_host;
char *cacert;
struct curl_slist *headers;
char *post_body;
char *cacert;
struct curl_slist *headers;
char *post_body;
@@
-226,11
+226,6
@@
static void cj_advance_array(cj_t *db) {
#define CJ_CB_ABORT 0
#define CJ_CB_CONTINUE 1
#define CJ_CB_ABORT 0
#define CJ_CB_CONTINUE 1
-static int cj_cb_boolean(void *ctx, int boolVal) {
- cj_advance_array(ctx);
- return CJ_CB_CONTINUE;
-}
-
static int cj_cb_null(void *ctx) {
cj_advance_array(ctx);
return CJ_CB_CONTINUE;
static int cj_cb_null(void *ctx) {
cj_advance_array(ctx);
return CJ_CB_CONTINUE;
@@
-292,6
+287,13
@@
static int cj_cb_string(void *ctx, const unsigned char *val, yajl_len_t len) {
return cj_cb_number(ctx, (const char *)val, len);
} /* int cj_cb_string */
return cj_cb_number(ctx, (const char *)val, len);
} /* int cj_cb_string */
+static int cj_cb_boolean(void *ctx, int boolVal) {
+ if (boolVal)
+ return cj_cb_number(ctx, "1", 1);
+ else
+ return cj_cb_number(ctx, "0", 1);
+} /* int cj_cb_boolean */
+
static int cj_cb_end(void *ctx) {
cj_t *db = (cj_t *)ctx;
memset(&db->state[db->depth], 0, sizeof(db->state[db->depth]));
static int cj_cb_end(void *ctx) {
cj_t *db = (cj_t *)ctx;
memset(&db->state[db->depth], 0, sizeof(db->state[db->depth]));
@@
-323,7
+325,7
@@
static int cj_cb_start_array(void *ctx) {
return CJ_CB_ABORT;
}
db->depth++;
return CJ_CB_ABORT;
}
db->depth++;
- db->state[db->depth].in_array =
1
;
+ db->state[db->depth].in_array =
true
;
db->state[db->depth].index = 0;
cj_load_key(db, "0");
db->state[db->depth].index = 0;
cj_load_key(db, "0");
@@
-333,7
+335,7
@@
static int cj_cb_start_array(void *ctx) {
static int cj_cb_end_array(void *ctx) {
cj_t *db = (cj_t *)ctx;
static int cj_cb_end_array(void *ctx) {
cj_t *db = (cj_t *)ctx;
- db->state[db->depth].in_array =
0
;
+ db->state[db->depth].in_array =
false
;
return cj_cb_end(ctx);
}
return cj_cb_end(ctx);
}
@@
-822,7
+824,6
@@
static void cj_submit_impl(cj_t *db, cj_key_t *key, value_t *value) /* {{{ */
static int cj_sock_perform(cj_t *db) /* {{{ */
{
static int cj_sock_perform(cj_t *db) /* {{{ */
{
- char errbuf[1024];
struct sockaddr_un sa_unix = {
.sun_family = AF_UNIX,
};
struct sockaddr_un sa_unix = {
.sun_family = AF_UNIX,
};
@@
-833,8
+834,7
@@
static int cj_sock_perform(cj_t *db) /* {{{ */
return -1;
if (connect(fd, (struct sockaddr *)&sa_unix, sizeof(sa_unix)) < 0) {
ERROR("curl_json plugin: connect(%s) failed: %s",
return -1;
if (connect(fd, (struct sockaddr *)&sa_unix, sizeof(sa_unix)) < 0) {
ERROR("curl_json plugin: connect(%s) failed: %s",
- (db->sock != NULL) ? db->sock : "<null>",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ (db->sock != NULL) ? db->sock : "<null>", STRERRNO);
close(fd);
return -1;
}
close(fd);
return -1;
}
@@
-845,8
+845,7
@@
static int cj_sock_perform(cj_t *db) /* {{{ */
red = read(fd, buffer, sizeof(buffer));
if (red < 0) {
ERROR("curl_json plugin: read(%s) failed: %s",
red = read(fd, buffer, sizeof(buffer));
if (red < 0) {
ERROR("curl_json plugin: read(%s) failed: %s",
- (db->sock != NULL) ? db->sock : "<null>",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ (db->sock != NULL) ? db->sock : "<null>", STRERRNO);
close(fd);
return -1;
}
close(fd);
return -1;
}