# HG changeset patch # User Binki # Date 2009-06-29 22:34:43 # Node ID 4186f3b04f1c34bf8fe809e424d02c009d00c069 # Parent 29260fa99dfad46d48550f2d56b60897a2df20a1 attempted to make the config's include function global diff --git a/src/client/libdistren_config.c b/src/client/libdistren_config.c --- a/src/client/libdistren_config.c +++ b/src/client/libdistren_config.c @@ -34,7 +34,6 @@ int _distren_getoptions(distren_t handle cfg_opt_t cfg_opts[] = { CFG_STR("server", NULL, 0), - CFG_FUNC("include", &cfg_include), /*< @todo this should be added by the lidistrencommon.so rather then individually */ CFG_END() }; diff --git a/src/common/options.c b/src/common/options.c --- a/src/common/options.c +++ b/src/common/options.c @@ -77,7 +77,7 @@ int options_init(int argc, char *argv[], { CFG_END() }; - + /* In these arrays, I should replace NULL with a pointer to a string in the struct which should hold the result of confuse processing an option. This is partially because confuse will not free the values it parses. */ @@ -89,7 +89,7 @@ int options_init(int argc, char *argv[], CFG_STR_LIST("types", NULL, CFGF_NONE), CFG_END() }; - + cfg_opt_t opts[] = { CFG_SEC("common", @@ -101,6 +101,8 @@ int options_init(int argc, char *argv[], CFG_SEC(myname, myopts, 0), + CFG_FUNC("include", + &cfg_include), CFG_END() };