Revision bc2fb680 conf/conf.c

View differences:

conf/conf.c
39 39
int
40 40
config_parse(struct config *c)
41 41
{
42
  struct proto_config *p;
43

  
44 42
  debug("Parsing configuration file `%s'\n", c->file_name);
45 43
  new_config = c;
46
  cfg_pool = c->pool;
47 44
  cfg_mem = c->mem;
48 45
  if (setjmp(conf_jmpbuf))
49 46
    return 0;
50
  cf_lex_init(1);
47
  cf_lex_init(0);
51 48
  cf_lex_init_tables();
52 49
  protos_preconfig(c);
53 50
  rt_preconfig(c);
......
61 58
  return 1;
62 59
}
63 60

  
61
int
62
cli_parse(struct config *c)
63
{
64
  new_config = c;
65
  cfg_mem = c->mem;
66
  if (setjmp(conf_jmpbuf))
67
    return 0;
68
  cf_lex_init(1);
69
  cf_parse();
70
  return 1;
71
}
72

  
64 73
void
65 74
config_free(struct config *c)
66 75
{

Also available in: Unified diff