X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=fe2bce3c365124fd700becaf29599b79f103b3d5;hb=070563c1ac6bf489cb13095ed30a6d290b98ac75;hp=aade4763ab26932333b3baa67a38789aa37883ba;hpb=211a3152e621551647547d3098281a1497751883;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index aade4763..fe2bce3c 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -575,14 +575,14 @@ static oconfig_item_t *cf_read_dir (const char *dir, int depth)
 		ERROR ("configfile: malloc failed.");
 		return (NULL);
 	}
-	memset (root, '\0', sizeof (oconfig_item_t));
+	memset (root, 0, sizeof (oconfig_item_t));
 
 	while ((de = readdir (dh)) != NULL)
 	{
 		char   name[1024];
 		char **tmp;
 
-		if ((de->d_name[0] == '.') || (de->d_name[0] == '\0'))
+		if ((de->d_name[0] == '.') || (de->d_name[0] == 0))
 			continue;
 
 		status = ssnprintf (name, sizeof (name), "%s/%s",
@@ -624,13 +624,11 @@ static oconfig_item_t *cf_read_dir (const char *dir, int depth)
 		char *name = filenames[i];
 
 		temp = cf_read_generic (name, depth);
-		if (temp == NULL) {
-			int j;
-			for (j = i; j < filenames_num; ++j)
-				free (filenames[j]);
-			free (filenames);
-			oconfig_free (root);
-			return (NULL);
+		if (temp == NULL)
+		{
+			/* An error should already have been reported. */
+			sfree (name);
+			continue;
 		}
 
 		cf_ci_append_children (root, temp);