diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-05-19 18:53:10 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-05-19 18:53:10 +0000 |
| commit | c029aaaf43f6d9e973b669a9e00834e327f4672f (patch) | |
| tree | 01753f1088ce45097d89f8d4900a494150d19f07 /app/cwm/conf.c | |
| parent | 180ab48b217df4d99b0c912e293bb919f027a5b3 (diff) | |
General cleanup.
ok okan@.
Diffstat (limited to 'app/cwm/conf.c')
| -rw-r--r-- | app/cwm/conf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c index 35f3577d0..7cd5d2b52 100644 --- a/app/cwm/conf.c +++ b/app/cwm/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: conf.c,v 1.34 2008/05/19 17:11:19 okan Exp $ + * $Id: conf.c,v 1.35 2008/05/19 18:53:09 oga Exp $ */ #include "headers.h" @@ -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); |