diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-02-18 16:19:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-02-18 16:19:36 +0300 |
| commit | 5b74faa8afd04771af7acb918072ea71a3db475f (patch) | |
| tree | 47d24a43925e95aea6acb8ff321cb9543600fda4 /src/common/HPM.c | |
| parent | 1bfb8c1283a0c662902cc8cb94d30159a9bc1183 (diff) | |
| parent | 1d2eb6d23519a971db0646a146152fc6f79350f1 (diff) | |
| download | hercules-5b74faa8afd04771af7acb918072ea71a3db475f.tar.gz hercules-5b74faa8afd04771af7acb918072ea71a3db475f.tar.bz2 hercules-5b74faa8afd04771af7acb918072ea71a3db475f.tar.xz hercules-5b74faa8afd04771af7acb918072ea71a3db475f.zip | |
Merge pull request #1160 from MishimaHaruna/libconfig
Libconfig: update to 1.5 and various improvements
Diffstat (limited to 'src/common/HPM.c')
| -rw-r--r-- | src/common/HPM.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/HPM.c b/src/common/HPM.c index d9c3262d7..f115c886e 100644 --- a/src/common/HPM.c +++ b/src/common/HPM.c @@ -616,8 +616,8 @@ CMDLINEARG(loadplugin) * Reads the plugin configuration and loads the plugins as necessary. */ void hplugins_config_read(void) { - config_t plugins_conf; - config_setting_t *plist = NULL; + struct config_t plugins_conf; + struct config_setting_t *plist = NULL; const char *config_filename = "conf/plugins.conf"; // FIXME hardcoded name FILE *fp; int i; @@ -628,12 +628,12 @@ void hplugins_config_read(void) { fclose(fp); } - if (libconfig->read_file(&plugins_conf, config_filename)) + if (!libconfig->load_file(&plugins_conf, config_filename)) return; plist = libconfig->lookup(&plugins_conf, "plugins_list"); for (i = 0; i < VECTOR_LENGTH(HPM->cmdline_load_plugins); i++) { - config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING); + struct config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING); config_setting_set_string(entry, VECTOR_INDEX(HPM->cmdline_load_plugins, i)); } |