X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Fconfigfile.c;h=78d4eea83fe24b4f203b74ccab3ca0185c73b776;hb=91103db5378a036c0e4da9d512f686d9d0096ff7;hp=16e07247b3cf56d07937d677c1eddf861c5c2655;hpb=2cf10557f58144e13793a3d69ae5d4b7c8d6c305;p=collectd.git

diff --git a/src/daemon/configfile.c b/src/daemon/configfile.c
index 16e07247..78d4eea8 100644
--- a/src/daemon/configfile.c
+++ b/src/daemon/configfile.c
@@ -72,15 +72,15 @@ typedef struct cf_complex_callback_s
 
 typedef struct cf_value_map_s
 {
-	char *key;
+	const char *key;
 	int (*func) (oconfig_item_t *);
 } cf_value_map_t;
 
 typedef struct cf_global_option_s
 {
-	char *key;
+	const char *key;
 	char *value;
-	char *def;
+	const char *def;
 } cf_global_option_t;
 
 /*
@@ -290,20 +290,25 @@ static int dispatch_loadplugin (oconfig_item_t *ci)
 	/* default to the global interval set before loading this plugin */
 	memset (&ctx, 0, sizeof (ctx));
 	ctx.interval = cf_get_default_interval ();
+	ctx.flush_interval = 0;
+	ctx.flush_timeout = 0;
 
-	for (i = 0; i < ci->children_num; ++i) {
-		if (strcasecmp("Globals", ci->children[i].key) == 0)
-			cf_util_get_flag (ci->children + i, &flags, PLUGIN_FLAGS_GLOBAL);
-		else if (strcasecmp ("Interval", ci->children[i].key) == 0) {
-			if (cf_util_get_cdtime (ci->children + i, &ctx.interval) != 0) {
-				/* cf_util_get_cdtime will log an error */
-				continue;
-			}
-		}
+	for (i = 0; i < ci->children_num; ++i)
+	{
+		oconfig_item_t *child = ci->children + i;
+
+		if (strcasecmp("Globals", child->key) == 0)
+			cf_util_get_flag (child, &flags, PLUGIN_FLAGS_GLOBAL);
+		else if (strcasecmp ("Interval", child->key) == 0)
+			cf_util_get_cdtime (child, &ctx.interval);
+		else if (strcasecmp ("FlushInterval", child->key) == 0)
+			cf_util_get_cdtime (child, &ctx.flush_interval);
+		else if (strcasecmp ("FlushTimeout", child->key) == 0)
+			cf_util_get_cdtime (child, &ctx.flush_timeout);
 		else {
 			WARNING("Ignoring unknown LoadPlugin option \"%s\" "
 					"for plugin \"%s\"",
-					ci->children[i].key, ci->values[0].value.string);
+					child->key, ci->values[0].value.string);
 		}
 	}
 
@@ -376,7 +381,7 @@ static int dispatch_value (oconfig_item_t *ci)
 static int dispatch_block_plugin (oconfig_item_t *ci)
 {
 	int i;
-	char *name;
+	const char *name;
 
 	cf_complex_callback_t *cb;
 
@@ -712,14 +717,13 @@ static oconfig_item_t *cf_read_dir (const char *dir,
 		return (NULL);
 	}
 
-	root = (oconfig_item_t *) malloc (sizeof (oconfig_item_t));
+	root = calloc (1, sizeof (*root));
 	if (root == NULL)
 	{
-		ERROR ("configfile: malloc failed.");
+		ERROR ("configfile: calloc failed.");
 		closedir (dh);
 		return (NULL);
 	}
-	memset (root, 0, sizeof (oconfig_item_t));
 
 	while ((de = readdir (dh)) != NULL)
 	{
@@ -830,13 +834,12 @@ static oconfig_item_t *cf_read_generic (const char *path,
 		return (NULL);
 	}
 
-	root = (oconfig_item_t *) malloc (sizeof (oconfig_item_t));
+	root = calloc (1, sizeof (*root));
 	if (root == NULL)
 	{
-		ERROR ("configfile: malloc failed.");
+		ERROR ("configfile: calloc failed.");
 		return (NULL);
 	}
-	memset (root, '\0', sizeof (oconfig_item_t));
 
 	/* wordexp() might return a sorted list already. That's not
 	 * documented though, so let's make sure we get what we want. */
@@ -1062,7 +1065,7 @@ void cf_register (const char *type,
 	cf_unregister (type);
 
 	/* This pointer will be free'd in `cf_unregister' */
-	if ((cf_cb = (cf_callback_t *) malloc (sizeof (cf_callback_t))) == NULL)
+	if ((cf_cb = malloc (sizeof (*cf_cb))) == NULL)
 		return;
 
 	cf_cb->type     = type;
@@ -1079,7 +1082,7 @@ int cf_register_complex (const char *type, int (*callback) (oconfig_item_t *))
 {
 	cf_complex_callback_t *new;
 
-	new = (cf_complex_callback_t *) malloc (sizeof (cf_complex_callback_t));
+	new = malloc (sizeof (*new));
 	if (new == NULL)
 		return (-1);
 
@@ -1110,7 +1113,7 @@ int cf_register_complex (const char *type, int (*callback) (oconfig_item_t *))
 	return (0);
 } /* int cf_register_complex */
 
-int cf_read (char *filename)
+int cf_read (const char *filename)
 {
 	oconfig_item_t *conf;
 	int i;