aboutsummaryrefslogtreecommitdiffstats
path: root/parse.y
diff options
context:
space:
mode:
authorokan2014-01-28 00:42:20 +0000
committerokan2014-01-28 00:42:20 +0000
commit6bb22ee14e5ed7514df17cbc7d8f28f6c7c66d47 (patch)
treeb700efb313d39b6bcdfec539d2870612e34b432c /parse.y
parentd1e09bda56224c5ad33e282277546046bab91318 (diff)
downloadcwm-6bb22ee14e5ed7514df17cbc7d8f28f6c7c66d47.tar.gz
Move conf_init/clear into main - no behaviour change; from Tiago Cunha.
Diffstat (limited to '')
-rw-r--r--parse.y9
1 files changed, 2 insertions, 7 deletions
diff --git a/parse.y b/parse.y
index 5af650b..33d49a0 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.53 2014/01/27 14:49:40 okan Exp $ */
+/* $OpenBSD: parse.y,v 1.54 2014/01/28 00:42:20 okan Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -545,7 +545,7 @@ popfile(void)
int
parse_config(const char *filename, struct conf *xconf)
{
- int errors = 0;
+ int errors = 0;
conf = xconf;
@@ -558,10 +558,5 @@ parse_config(const char *filename, struct conf *xconf)
errors = file->errors;
popfile();
- if (errors) {
- conf_clear(conf);
- conf_init(conf);
- }
-
return (errors ? -1 : 0);
}