mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Move conf_init/clear into main - no behaviour change; from Tiago Cunha.

Browse Source
This commit is contained in:
okan 2014-01-28 00:42:20 +00:00
parent 0608610cc7
commit 51b3fbee52
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calmwm.c
View File

@ -108,8 +108,11 @@ main(int argc, char **argv)
} }
conf_init(&Conf); conf_init(&Conf);
if (conf_path && (parse_config(conf_path, &Conf) == -1)) if (conf_path && (parse_config(conf_path, &Conf) == -1)) {
warnx("config file %s has errors, not loading", conf_path); warnx("config file %s has errors, not loading", conf_path);
conf_clear(&Conf);
conf_init(&Conf);
}
free(conf_path); free(conf_path);
x_init(display_name); x_init(display_name);

7
parse.y
View File

@ -545,7 +545,7 @@ popfile(void)
int int
parse_config(const char *filename, struct conf *xconf) parse_config(const char *filename, struct conf *xconf)
{ {
int errors = 0; int errors = 0;
conf = xconf; conf = xconf;
@ -558,10 +558,5 @@ parse_config(const char *filename, struct conf *xconf)
errors = file->errors; errors = file->errors;
popfile(); popfile();
if (errors) {
conf_clear(conf);
conf_init(conf);
}
return (errors ? -1 : 0); return (errors ? -1 : 0);
} }