From: fatbob313 <martin@fatbob.nu>
Date: Thu, 20 Jan 2011 08:34:19 +0000 (+0000)
Subject: Patch from tilman2: Don't print null config file name
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;h=3fbab274e9932e10d257e70fad310e00a4260d43;p=umurmur.git

Patch from tilman2: Don't print null config file name
---

diff --git a/src/conf.c b/src/conf.c
index d85ff7c..185e508 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -50,14 +50,10 @@ const char defaultconfig[] = DEFAULT_CONFIG;
 
 int Conf_init(const char *conffile)
 {
-	const char *conf;
-	
 	config_init(&configuration);
 	if (conffile == NULL)
-		conf = defaultconfig;
-	else
-		conf = conffile;
-	if (config_read_file(&configuration, conf) != CONFIG_TRUE) {
+		conffile = defaultconfig;
+	if (config_read_file(&configuration, conffile) != CONFIG_TRUE) {
 		fprintf(stderr, "Error in config file %s: %s at line %d\n", conffile,
 				config_error_text(&configuration), config_error_line(&configuration));
 		exit(1);