projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1710 from rpv-tomsk/perl-plugin-fixes
[collectd.git]
/
src
/
powerdns.c
diff --git
a/src/powerdns.c
b/src/powerdns.c
index
0400f3d
..
f72bd40
100644
(file)
--- a/
src/powerdns.c
+++ b/
src/powerdns.c
@@
-75,9
+75,9
@@
struct list_item_s
struct statname_lookup_s
{
struct statname_lookup_s
{
- char *name;
- char *type;
- char *type_instance;
+ c
onst c
har *name;
+ c
onst c
har *type;
+ c
onst c
har *type_instance;
};
typedef struct statname_lookup_s statname_lookup_t;
};
typedef struct statname_lookup_s statname_lookup_t;
@@
-143,7
+143,7
@@
uptime number of seconds process has been running (since 3.1.5)
user-msec number of CPU milliseconds spent in 'user' mode
}}} */
user-msec number of CPU milliseconds spent in 'user' mode
}}} */
-const char* const default_server_fields[] = /* {{{ */
+
static
const char* const default_server_fields[] = /* {{{ */
{
"latency",
"packetcache-hit",
{
"latency",
"packetcache-hit",
@@
-158,9
+158,9
@@
const char* const default_server_fields[] = /* {{{ */
"udp-answers",
"udp-queries",
}; /* }}} */
"udp-answers",
"udp-queries",
}; /* }}} */
-int default_server_fields_num = STATIC_ARRAY_SIZE (default_server_fields);
+
static
int default_server_fields_num = STATIC_ARRAY_SIZE (default_server_fields);
-statname_lookup_t lookup_table[] = /* {{{ */
+stat
ic stat
name_lookup_t lookup_table[] = /* {{{ */
{
/*********************
* Server statistics *
{
/*********************
* Server statistics *
@@
-285,7
+285,7
@@
statname_lookup_t lookup_table[] = /* {{{ */
{"unexpected-packets", "dns_answer", "unexpected"},
{"uptime", "uptime", NULL}
}; /* }}} */
{"unexpected-packets", "dns_answer", "unexpected"},
{"uptime", "uptime", NULL}
}; /* }}} */
-int lookup_table_length = STATIC_ARRAY_SIZE (lookup_table);
+
static
int lookup_table_length = STATIC_ARRAY_SIZE (lookup_table);
static llist_t *list = NULL;
static llist_t *list = NULL;
@@
-465,7
+465,7
@@
static int powerdns_get_data_dgram (list_item_t *item, /* {{{ */
return (-1);
assert (buffer_size > 0);
return (-1);
assert (buffer_size > 0);
- buffer =
(char *)
malloc (buffer_size);
+ buffer = malloc (buffer_size);
if (buffer == NULL)
{
FUNC_ERROR ("malloc");
if (buffer == NULL)
{
FUNC_ERROR ("malloc");
@@
-542,7
+542,7
@@
static int powerdns_get_data_stream (list_item_t *item, /* {{{ */
else if (status == 0)
break;
else if (status == 0)
break;
- buffer_new =
(char *)
realloc (buffer, buffer_size + status + 1);
+ buffer_new = realloc (buffer, buffer_size + status + 1);
if (buffer_new == NULL)
{
FUNC_ERROR ("realloc");
if (buffer_new == NULL)
{
FUNC_ERROR ("realloc");
@@
-799,7
+799,7
@@
static int powerdns_config_add_collect (list_item_t *li, /* {{{ */
return (-1);
}
return (-1);
}
- temp =
(char **)
realloc (li->fields,
+ temp = realloc (li->fields,
sizeof (char *) * (li->fields_num + ci->values_num));
if (temp == NULL)
{
sizeof (char *) * (li->fields_num + ci->values_num));
if (temp == NULL)
{
@@
-840,13
+840,12
@@
static int powerdns_config_add_server (oconfig_item_t *ci) /* {{{ */
return (-1);
}
return (-1);
}
- item =
(list_item_t *) malloc (sizeof (list_item_t
));
+ item =
calloc (1, sizeof (*item
));
if (item == NULL)
{
if (item == NULL)
{
- ERROR ("powerdns plugin:
m
alloc failed.");
+ ERROR ("powerdns plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (item, '\0', sizeof (list_item_t));
item->instance = strdup (ci->values[0].value.string);
if (item->instance == NULL)
item->instance = strdup (ci->values[0].value.string);
if (item->instance == NULL)