diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2011-08-22 16:18:06 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2011-08-22 16:18:06 +0000 |
| commit | 2f42046dbefbf66f3bc6d12d2e562b0bd7eca718 (patch) | |
| tree | 36ab9c3413d778bf2eb8081db0d83eddf244108e /app/cwm/parse.y | |
| parent | 96de74950e104fa00d83f682970d61ae325559ea (diff) | |
revert r1.11 of parse.y and create logic in conf_setup instead to deal
with the various scenarios of when to attempt a parse of the config,
load defaults, and when to warn and/or exit. triggered by bogus warning
first noticed by sobrado@.
ok oga@
Diffstat (limited to 'app/cwm/parse.y')
| -rw-r--r-- | app/cwm/parse.y | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/cwm/parse.y b/app/cwm/parse.y index 94dc862aa..5421b126f 100644 --- a/app/cwm/parse.y +++ b/app/cwm/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.29 2011/07/25 15:10:24 okan Exp $ */ +/* $OpenBSD: parse.y,v 1.30 2011/08/22 16:18:05 okan Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -462,8 +462,6 @@ pushfile(const char *name) nfile->name = xstrdup(name); if ((nfile->stream = fopen(nfile->name, "r")) == NULL) { - if (errno != ENOENT) - warn("%s", nfile->name); free(nfile->name); free(nfile); return (NULL); |