projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle failure of simple config callbacks
[collectd.git]
/
src
/
memcached.c
diff --git
a/src/memcached.c
b/src/memcached.c
index
95a9eda
..
0baf6c2
100644
(file)
--- a/
src/memcached.c
+++ b/
src/memcached.c
@@
-32,8
+32,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <netdb.h>
#include <netinet/in.h>
#include <netdb.h>
#include <netinet/in.h>
@@
-69,7
+69,7
@@
struct memcached_s {
};
typedef struct memcached_s memcached_t;
};
typedef struct memcached_s memcached_t;
-static bool memcached_have_instances
= 0
;
+static bool memcached_have_instances;
static void memcached_free(void *arg) {
memcached_t *st = arg;
static void memcached_free(void *arg) {
memcached_t *st = arg;
@@
-475,7
+475,7
@@
static int memcached_read(user_data_t *user_data) {
if (strsplit(line, fields, 3) != 3)
continue;
if (strsplit(line, fields, 3) != 3)
continue;
-
in
t name_len = strlen(fields[1]);
+
size_
t name_len = strlen(fields[1]);
if (name_len == 0)
continue;
if (name_len == 0)
continue;
@@
-702,7
+702,7
@@
static int config_add_instance(oconfig_item_t *ci) {
int status = 0;
/* Disable automatic generation of default instance in the init callback. */
int status = 0;
/* Disable automatic generation of default instance in the init callback. */
- memcached_have_instances =
1
;
+ memcached_have_instances =
true
;
memcached_t *st = calloc(1, sizeof(*st));
if (st == NULL) {
memcached_t *st = calloc(1, sizeof(*st));
if (st == NULL) {
@@
-797,7
+797,7
@@
static int memcached_init(void) {
int status = memcached_add_read_callback(st);
if (status == 0)
int status = memcached_add_read_callback(st);
if (status == 0)
- memcached_have_instances =
1
;
+ memcached_have_instances =
true
;
return status;
} /* int memcached_init */
return status;
} /* int memcached_init */