X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectd.c;h=1ccc1c08e1eca87d4975351d1764fe2116c38031;hb=8d8c82f9537feb8f15f049f3b1c071eaf2f5e2a5;hp=d96d676790d0d8c730610484637c9322e2a27b5b;hpb=3faf514fd9b869cadda0f895e14e5036313c7781;p=collectd.git

diff --git a/src/collectd.c b/src/collectd.c
index d96d6767..1ccc1c08 100644
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -118,7 +118,7 @@ static int init_hostname (void)
 		ERROR ("Looking up \"%s\" failed. You have set the "
 				"\"FQDNLookup\" option, but I cannot resolve "
 				"my hostname to a fully qualified domain "
-				"name. Please fix you network "
+				"name. Please fix the network "
 				"configuration.", hostname_g);
 		return (-1);
 	}
@@ -182,8 +182,10 @@ static int change_basedir (const char *orig_dir)
 	while ((dirlen > 0) && (dir[dirlen - 1] == '/'))
 		dir[--dirlen] = '\0';
 
-	if (dirlen <= 0)
+	if (dirlen <= 0) {
+		free (dir);
 		return (-1);
+	}
 
 	status = chdir (dir);
 	if (status == 0)
@@ -384,8 +386,9 @@ static int pidfile_create (void)
 static int pidfile_remove (void)
 {
 	const char *file = global_option_get ("PIDFile");
+	if (file == NULL)
+		return 0;
 
-	DEBUG ("unlink (%s)", (file != NULL) ? file : "<null>");
 	return (unlink (file));
 } /* static int pidfile_remove (const char *file) */
 #endif /* COLLECT_DAEMON */