[Olsr-cvs] olsrd-current/src olsr_cfg.h, 1.35, 1.36 main.c, 1.100, 1.101

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17552/src

Modified Files:
	olsr_cfg.h main.c 
Log Message:
Killed "struct olsrd_config *cnf" in src/cfgparser/olsrd_conf.h and replaced
it's usage with "olsr_cnf" from src/defs.h.
Serious cleanup: olsrd_get_default_cnf() does no longer initialize the global
"cnf" variable" but uses a local one which is returned as before. And
olsrd_parse_cnf() does no longer return the global variable it is working on.


Index: olsr_cfg.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/olsr_cfg.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** olsr_cfg.h	22 Oct 2007 21:02:49 -0000	1.35
--- olsr_cfg.h	3 Nov 2007 23:21:27 -0000	1.36
***************
*** 258,262 ****
   */
  
! struct olsrd_config *
  olsrd_parse_cnf(const char *);
  
--- 258,262 ----
   */
  
! int
  olsrd_parse_cnf(const char *);
  

Index: main.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/main.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** main.c	17 Sep 2007 22:24:22 -0000	1.100
--- main.c	3 Nov 2007 23:21:27 -0000	1.101
***************
*** 210,214 ****
     * set up configuration prior to processing commandline options
     */
!   if((olsr_cnf = olsrd_parse_cnf(conf_file_name)) == NULL)
      {
        printf("Using default config values(no configfile)\n");
--- 210,214 ----
     * set up configuration prior to processing commandline options
     */
!   if(olsrd_parse_cnf(conf_file_name))
      {
        printf("Using default config values(no configfile)\n");