CVS: linux-atm/src/sigd cfg_l.l,1.2,1.2.2.1 atmsigd.c,1.2,1.2.2.1

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/sigd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26437

Modified Files:
      Tag: V2_5_0
	cfg_l.l atmsigd.c 
Log Message:
accept ilmi style uni specifications


Index: cfg_l.l
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/cfg_l.l,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** cfg_l.l	9 Oct 2001 22:33:07 -0000	1.2
--- cfg_l.l	25 Sep 2004 11:25:48 -0000	1.2.2.1
***************
*** 42,47 ****
--- 42,50 ----
  <N>sig			return TOK_SIG;
  <N>uni30		return TOK_UNI30;
+ <N>3.0			return TOK_UNI30;
  <N>uni31		return TOK_UNI31;
+ <N>3.1			return TOK_UNI31;
  <N>uni40		return TOK_UNI40;
+ <N>4.0			return TOK_UNI40;
  <N>[qQ].2963.1		return TOK_Q2963_1;
  <N>mode			return TOK_MODE;

Index: atmsigd.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/atmsigd.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** atmsigd.c	9 Oct 2001 22:33:07 -0000	1.2
--- atmsigd.c	25 Sep 2004 11:25:48 -0000	1.2.2.1
***************
*** 429,438 ****
  		    int uni = 0; /* silence gcc */
  
! 		    if (!strcmp(optarg,"uni30")) uni = S_UNI30;
! 		    else if (!strcmp(optarg,"uni31")) uni = S_UNI31;
! 		    else if (!strcmp(optarg,"uni31+uni30"))
  			uni = S_UNI30 | S_UNI31;
! 		    else if (!strcmp(optarg,"uni40")) uni = S_UNI40;
! 		    else if (!strcmp(optarg,"uni40+q.2963.1"))
  			uni = S_UNI40 | S_Q2963_1;
  		    else usage(argv[0]);
--- 429,438 ----
  		    int uni = 0; /* silence gcc */
  
! 		    if (!strcmp(optarg,"uni30") || !strcmp(optarg,"3.0")) uni = S_UNI30;
! 		    else if (!strcmp(optarg,"uni31") || !strcmp(optarg,"3.1")) uni = S_UNI31;
! 		    else if (!strcmp(optarg,"uni31+uni30") || !strcmp(optarg,"3.1+3.0"))
  			uni = S_UNI30 | S_UNI31;
! 		    else if (!strcmp(optarg,"uni40") || !strcmp(optarg,"4.0")) uni = S_UNI40;
! 		    else if (!strcmp(optarg,"uni40+q.2963.1") || !strcmp(optarg,"4.0+q.2963.1"))
  			uni = S_UNI40 | S_Q2963_1;
  		    else usage(argv[0]);