[Olsr-cvs] olsrd-current/src/cfgparser olsrd_conf.c, 1.57, 1.58 olsrd_conf.h, 1.13, 1.14

[Bernd Petrovitsch]

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

Modified Files:
	olsrd_conf.c olsrd_conf.h 
Log Message:
* fix startup breakage

Index: olsrd_conf.h
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** olsrd_conf.h	28 Apr 2007 20:46:32 -0000	1.13
--- olsrd_conf.h	30 Oct 2007 09:19:22 -0000	1.14
***************
*** 50,56 ****
  
  
! int current_line;
  
! struct olsrd_config *cnf;
  
  struct conf_token
--- 50,56 ----
  
  
! extern int current_line;
  
! extern struct olsrd_config *cnf;
  
  struct conf_token

Index: olsrd_conf.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/olsrd_conf.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** olsrd_conf.c	24 Oct 2007 13:46:36 -0000	1.57
--- olsrd_conf.c	30 Oct 2007 09:19:22 -0000	1.58
***************
*** 59,62 ****
--- 59,65 ----
  static char copyright_string[] __attribute__((unused)) = "The olsr.org Optimized Link-State Routing daemon(olsrd) Copyright (c) 2004, Andreas Tønnesen((spam-protected)) All rights reserved.";
  
+ int current_line;
+ struct olsrd_config *cnf;
+ 
  #ifdef MAKEBIN
  
***************
*** 105,109 ****
    int rc;
  
!   struct olsrd_config *cnf = malloc(sizeof(struct olsrd_config));
    if (cnf == NULL) {
      fprintf(stderr, "Out of memory %s\n", __func__);
--- 108,113 ----
    int rc;
  
!   /* Initialize the global varibles - oparse.y needs it there */
!   cnf = malloc(sizeof(struct olsrd_config));
    if (cnf == NULL) {
      fprintf(stderr, "Out of memory %s\n", __func__);