Changeset - 4186f3b04f1c
[Not reviewed]
default
0 2 0
Nathan Brink (binki) - 16 years ago 2009-06-29 22:34:43
ohnobinki@ohnopublishing.net
attempted to make the config's include function global
2 files changed with 2 insertions and 1 deletions:
0 comments (0 inline, 0 general)
src/client/libdistren_config.c
Show inline comments
 
@@ -25,25 +25,24 @@
 
#include "options.h"
 

	
 
/**
 
@todo Stub
 
 */
 
int _distren_getoptions(distren_t handle)
 
{
 
  cfg_t *cfg;
 

	
 
  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()
 
    };
 
  
 
  if(options_init(0, NULL, &cfg, cfg_opts, "client", &handle->options))
 
    {
 
      fprintf(stderr, "error getting configuration\n");
 
      return 1;
 
    }
 
  
 
  return 1;
 
}
 

	
src/common/options.c
Show inline comments
 
@@ -92,24 +92,26 @@ int options_init(int argc, char *argv[],
 
  
 
  cfg_opt_t opts[] =
 
    {
 
      CFG_SEC("common",
 
	      common_opts,
 
	      CFGF_NONE),
 
      CFG_SEC("server",
 
	      server_opts,
 
	      CFGF_MULTI | CFGF_TITLE),
 
      CFG_SEC(myname,
 
	      myopts,
 
	      0),
 
      CFG_FUNC("include",
 
	       &cfg_include),
 
      CFG_END()
 
    };
 

	
 

	
 

	
 
  (*allopts)->data->cfg = cfg_init(opts, 0);
 
  switch(cfg_parse((*allopts)->data->cfg, configfile))
 
    {
 
    default:
 
      fprintf(stderr, "cfg_parse returned an unknown error code\n");
 
    case CFG_FILE_ERROR:
 
      cfg_error((*allopts)->data->cfg, "Couldn't open file ``%s''\n", configfile);
0 comments (0 inline, 0 general)