about summary refs log tree commit diff
path: root/conf.c
diff options
context:
space:
mode:
authoroga <oga>2008-05-19 18:53:09 +0000
committeroga <oga>2008-05-19 18:53:09 +0000
commit3bb0b451f78d13b4624e52b726f51e4847a84a2f (patch)
tree4c640877a4c5129a3f2a9f2f30dbc3967e5588f9 /conf.c
parent53116c4ec3792901d7ac774199963d915ea0da5a (diff)
downloadcwm-3bb0b451f78d13b4624e52b726f51e4847a84a2f.tar.gz
cwm-3bb0b451f78d13b4624e52b726f51e4847a84a2f.tar.xz
cwm-3bb0b451f78d13b4624e52b726f51e4847a84a2f.zip
General cleanup.
ok okan@.
Diffstat (limited to 'conf.c')
-rw-r--r--conf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf.c b/conf.c
index eb3b404..d328f52 100644
--- a/conf.c
+++ b/conf.c
@@ -157,9 +157,9 @@ conf_init(struct conf *c)
 }
 
 void
-conf_setup(struct conf *c, const char *conffile)
+conf_setup(struct conf *c, const char *conf_file)
 {
-	if (conffile == NULL) {
+	if (conf_file == NULL) {
 		char *home = getenv("HOME");
 
 		if (home == NULL)
@@ -168,7 +168,7 @@ conf_setup(struct conf *c, const char *conffile)
 		snprintf(c->conf_path, sizeof(c->conf_path), "%s/%s", home,
 		    CONFFILE);
 	} else
-		snprintf(c->conf_path, sizeof(c->conf_path), "%s", conffile);
+		snprintf(c->conf_path, sizeof(c->conf_path), "%s", conf_file);
 
 	conf_init(c);