[Olsr-cvs] olsrd-current/src/cfgparser oparse.y, 1.32, 1.33 oscan.lex, 1.22, 1.23

[Bernd Petrovitsch]

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

Modified Files:
	oparse.y oscan.lex 
Log Message:
* made a local function static
* removed unused TOK_SEMI and TOK_PLNAME. Thanks to
  Patrick McCarty <(spam-protected)> for spotting this.


Index: oscan.lex
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/oscan.lex,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** oscan.lex	20 Apr 2007 13:46:05 -0000	1.22
--- oscan.lex	13 May 2007 21:49:59 -0000	1.23
***************
*** 71,78 ****
  int yylex(void);
  
! struct conf_token *
  get_conf_token(void);
  
! struct conf_token *
  get_conf_token(void)
  {
--- 71,78 ----
  int yylex(void);
  
! static struct conf_token *
  get_conf_token(void);
  
! static struct conf_token *
  get_conf_token(void)
  {
***************
*** 135,143 ****
  }
  
- \; {
-   yylval = NULL;
-   return TOK_SEMI;
- }
- 
  \"[^\"]*\" {
    yylval = get_conf_token();
--- 135,138 ----
***************
*** 297,305 ****
  }
  
- "PlName" {
-   yylval = NULL;
-   return TOK_PLNAME;
- }
- 
  "PlParam" {
    yylval = NULL;
--- 292,295 ----

Index: oparse.y
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/cfgparser/oparse.y,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** oparse.y	20 Apr 2007 13:46:05 -0000	1.32
--- oparse.y	13 May 2007 21:49:59 -0000	1.33
***************
*** 128,132 ****
  %token TOK_OPEN
  %token TOK_CLOSE
- %token TOK_SEMI
  
  %token TOK_STRING
--- 128,131 ----
***************
*** 161,165 ****
  %token TOK_LQ_MULT
  %token TOK_CLEAR_SCREEN
- %token TOK_PLNAME
  %token TOK_PLPARAM
  
--- 160,163 ----