diff options
| author | gramanas <anastasis.gramm2@gmail.com> | 2018-10-27 01:32:10 +0300 |
|---|---|---|
| committer | gramanas <anastasis.gramm2@gmail.com> | 2018-10-27 01:32:10 +0300 |
| commit | 1b09a70af6096d2f85cadff82f227e4e6850bfda (patch) | |
| tree | cbeb0b413553686668592e780c10de175be1a8dd | |
| parent | 401820e28b74e09bffdeaa25fcf6de518487a433 (diff) | |
| download | ck-1b09a70af6096d2f85cadff82f227e4e6850bfda.tar.gz ck-1b09a70af6096d2f85cadff82f227e4e6850bfda.tar.bz2 ck-1b09a70af6096d2f85cadff82f227e4e6850bfda.zip | |
fix conf init
| -rw-r--r-- | src/ck.c | 5 | ||||
| -rw-r--r-- | src/confparser.c | 3 | ||||
| -rw-r--r-- | src/confparser.h | 1 |
3 files changed, 6 insertions, 3 deletions
@@ -37,9 +37,12 @@ ERRLOG(main); int main(int argc, const char **argv) { - initialize_errlog(argc, argv); UserOpt opt; Conf conf; + + initialize_errlog(argc, argv); + initialize_conf(&conf); + /* get user opt */ if (parse_action(argc, argv, &opt)) { goto error; diff --git a/src/confparser.c b/src/confparser.c index 3a7c357..f6ea3a0 100644 --- a/src/confparser.c +++ b/src/confparser.c @@ -16,7 +16,7 @@ ERRLOG(configfile); const char * const CONFIG_NAME = "/ckrc"; -void conf_values_initialize(Conf *c) { +void initialize_conf(Conf *c) { #define X(var, str, name) \ c->var = NULL; CONFIG_VARIABLES_TABLE @@ -55,7 +55,6 @@ void make_config_name(char * ret, const char *confPath) { int config_file_parse(Conf *conf, UserOpt *opt) { LOG("Using '%s' for ck configuration directory", opt->confDir); - conf_values_initialize(conf); FILE *confPtr; char confName[STR_L]; char line[STR_L]; diff --git a/src/confparser.h b/src/confparser.h index f4c52c3..d7af842 100644 --- a/src/confparser.h +++ b/src/confparser.h @@ -42,5 +42,6 @@ struct ConfigValues { extern int config_file_parse(Conf *conf, UserOpt *opt); extern void make_config_name(char * ret, const char *confPath); +extern void initialize_conf(Conf *conf); extern void free_conf(Conf *conf); #endif // CONFPARSER_H |