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 #1856 from rubenk/snmp-dont-dispatch-values-with-empty-type-instance
[collectd.git]
/
src
/
routeros.c
diff --git
a/src/routeros.c
b/src/routeros.c
index
667c2fa
..
a270f48
100644
(file)
--- a/
src/routeros.c
+++ b/
src/routeros.c
@@
-25,6
+25,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-326,12
+327,10
@@
static int cr_config_router (oconfig_item_t *ci) /* {{{ */
char read_name[128];
user_data_t user_data;
int status;
char read_name[128];
user_data_t user_data;
int status;
- int i;
- router_data =
malloc (
sizeof (*router_data));
+ router_data =
calloc (1,
sizeof (*router_data));
if (router_data == NULL)
return (-1);
if (router_data == NULL)
return (-1);
- memset (router_data, 0, sizeof (*router_data));
router_data->connection = NULL;
router_data->node = NULL;
router_data->service = NULL;
router_data->connection = NULL;
router_data->node = NULL;
router_data->service = NULL;
@@
-339,7
+338,7
@@
static int cr_config_router (oconfig_item_t *ci) /* {{{ */
router_data->password = NULL;
status = 0;
router_data->password = NULL;
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;
@@
-424,9
+423,7
@@
static int cr_config_router (oconfig_item_t *ci) /* {{{ */
static int cr_config (oconfig_item_t *ci)
{
static int cr_config (oconfig_item_t *ci)
{
- int i;
-
- for (i = 0; i < ci->children_num; i++)
+ for (int i = 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;