Diff for /embedaddon/ipsec-tools/src/libipsec/policy_token.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:39:10 version 1.1.1.2, 2014/06/15 16:37:11
Line 28 Line 28
 #define FLEX_SCANNER  #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2  #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5  #define YY_FLEX_MINOR_VERSION 5
#define YY_FLEX_SUBMINOR_VERSION 35#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0  #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA  #define FLEX_BETA
 #endif  #endif
Line 161  typedef unsigned int flex_uint32_t; Line 161  typedef unsigned int flex_uint32_t;
   
 /* Size of default input buffer. */  /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE  #ifndef YY_BUF_SIZE
 #ifdef __ia64__  
 /* On IA-64, the buffer size is 16k, not 8k.  
  * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.  
  * Ditto for the __ia64__ case accordingly.  
  */  
 #define YY_BUF_SIZE 32768  
 #else  
 #define YY_BUF_SIZE 16384  #define YY_BUF_SIZE 16384
 #endif /* __ia64__ */  
 #endif  #endif
   
 /* The state buf must be large enough to hold one state per character in the main buffer.  /* The state buf must be large enough to hold one state per character in the main buffer.
Line 181  typedef unsigned int flex_uint32_t; Line 173  typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;  typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif  #endif
   
extern int __libipsecleng;#ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
 typedef size_t yy_size_t;
 #endif
   
   extern yy_size_t __libipsecleng;
   
 extern FILE *__libipsecin, *__libipsecout;  extern FILE *__libipsecin, *__libipsecout;
   
 #define EOB_ACT_CONTINUE_SCAN 0  #define EOB_ACT_CONTINUE_SCAN 0
Line 207  extern FILE *__libipsecin, *__libipsecout; Line 204  extern FILE *__libipsecin, *__libipsecout;
   
 #define unput(c) yyunput( c, (yytext_ptr)  )  #define unput(c) yyunput( c, (yytext_ptr)  )
   
 #ifndef YY_TYPEDEF_YY_SIZE_T  
 #define YY_TYPEDEF_YY_SIZE_T  
 typedef size_t yy_size_t;  
 #endif  
   
 #ifndef YY_STRUCT_YY_BUFFER_STATE  #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE  #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state  struct yy_buffer_state
Line 229  struct yy_buffer_state Line 221  struct yy_buffer_state
         /* Number of characters read into yy_ch_buf, not including EOB          /* Number of characters read into yy_ch_buf, not including EOB
          * characters.           * characters.
          */           */
        int yy_n_chars;        yy_size_t yy_n_chars;
   
         /* Whether we "own" the buffer - i.e., we know we created it,          /* Whether we "own" the buffer - i.e., we know we created it,
          * and can realloc() it to grow it, and should free() it to           * and can realloc() it to grow it, and should free() it to
Line 299  static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Sta Line 291  static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Sta
   
 /* yy_hold_char holds the character lost when __libipsectext is formed. */  /* yy_hold_char holds the character lost when __libipsectext is formed. */
 static char yy_hold_char;  static char yy_hold_char;
static int yy_n_chars;           /* number of characters read into yy_ch_buf */static yy_size_t yy_n_chars;           /* number of characters read into yy_ch_buf */
int __libipsecleng;yy_size_t __libipsecleng;
   
 /* Points to current character in buffer. */  /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;  static char *yy_c_buf_p = (char *) 0;
Line 328  static void __libipsec_init_buffer (YY_BUFFER_STATE b, Line 320  static void __libipsec_init_buffer (YY_BUFFER_STATE b,
   
 YY_BUFFER_STATE __libipsec_scan_buffer (char *base,yy_size_t size  );  YY_BUFFER_STATE __libipsec_scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE __libipsec_scan_string (yyconst char *yy_str  );  YY_BUFFER_STATE __libipsec_scan_string (yyconst char *yy_str  );
YY_BUFFER_STATE __libipsec_scan_bytes (yyconst char *bytes,int len  );YY_BUFFER_STATE __libipsec_scan_bytes (yyconst char *bytes,yy_size_t len  );
   
 void *__libipsecalloc (yy_size_t  );  void *__libipsecalloc (yy_size_t  );
 void *__libipsecrealloc (void *,yy_size_t  );  void *__libipsecrealloc (void *,yy_size_t  );
Line 360  void __libipsecfree (void *  ); Line 352  void __libipsecfree (void *  );
   
 /* Begin user sect3 */  /* Begin user sect3 */
   
#define __libipsecwrap(n) 1#define __libipsecwrap() 1
 #define YY_SKIP_YYWRAP  #define YY_SKIP_YYWRAP
   
 typedef unsigned char YY_CHAR;  typedef unsigned char YY_CHAR;
Line 634  char *__libipsectext; Line 626  char *__libipsectext;
   
 int __libipseclex __P((void));  int __libipseclex __P((void));
 /* common section */  /* common section */
#line 638 "policy_token.c"#line 630 "policy_token.c"
   
 #define INITIAL 0  #define INITIAL 0
   
Line 673  FILE *__libipsecget_out (void ); Line 665  FILE *__libipsecget_out (void );
   
 void __libipsecset_out  (FILE * out_str  );  void __libipsecset_out  (FILE * out_str  );
   
int __libipsecget_leng (void );yy_size_t __libipsecget_leng (void );
   
 char *__libipsecget_text (void );  char *__libipsecget_text (void );
   
Line 713  static int input (void ); Line 705  static int input (void );
   
 /* Amount of stuff to slurp up with each read. */  /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE  #ifndef YY_READ_BUF_SIZE
 #ifdef __ia64__  
 /* On IA-64, the buffer size is 16k, not 8k */  
 #define YY_READ_BUF_SIZE 16384  
 #else  
 #define YY_READ_BUF_SIZE 8192  #define YY_READ_BUF_SIZE 8192
 #endif /* __ia64__ */  
 #endif  #endif
   
 /* Copy whatever the last rule matched to the standard output. */  /* Copy whatever the last rule matched to the standard output. */
Line 822  YY_DECL Line 809  YY_DECL
 #line 97 "policy_token.l"  #line 97 "policy_token.l"
   
   
#line 826 "policy_token.c"#line 813 "policy_token.c"
   
         if ( !(yy_init) )          if ( !(yy_init) )
                 {                  {
Line 1100  YY_RULE_SETUP Line 1087  YY_RULE_SETUP
 #line 167 "policy_token.l"  #line 167 "policy_token.l"
 ECHO;  ECHO;
         YY_BREAK          YY_BREAK
#line 1104 "policy_token.c"#line 1091 "policy_token.c"
 case YY_STATE_EOF(INITIAL):  case YY_STATE_EOF(INITIAL):
         yyterminate();          yyterminate();
   
Line 1286  static int yy_get_next_buffer (void) Line 1273  static int yy_get_next_buffer (void)
   
         else          else
                 {                  {
                        int num_to_read =                        yy_size_t num_to_read =
                         YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;                          YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
   
                 while ( num_to_read <= 0 )                  while ( num_to_read <= 0 )
                         { /* Not enough room in the buffer - grow it. */                          { /* Not enough room in the buffer - grow it. */
   
                         /* just a shorter name for the current buffer */                          /* just a shorter name for the current buffer */
                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER;                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
   
                         int yy_c_buf_p_offset =                          int yy_c_buf_p_offset =
                                 (int) ((yy_c_buf_p) - b->yy_ch_buf);                                  (int) ((yy_c_buf_p) - b->yy_ch_buf);
   
                         if ( b->yy_is_our_buffer )                          if ( b->yy_is_our_buffer )
                                 {                                  {
                                int new_size = b->yy_buf_size * 2;                                yy_size_t new_size = b->yy_buf_size * 2;
   
                                 if ( new_size <= 0 )                                  if ( new_size <= 0 )
                                         b->yy_buf_size += b->yy_buf_size / 8;                                          b->yy_buf_size += b->yy_buf_size / 8;
Line 1331  static int yy_get_next_buffer (void) Line 1318  static int yy_get_next_buffer (void)
   
                 /* Read in more data. */                  /* Read in more data. */
                 YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),                  YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
                        (yy_n_chars), (size_t) num_to_read );                        (yy_n_chars), num_to_read );
   
                 YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);                  YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
                 }                  }
Line 1426  static int yy_get_next_buffer (void) Line 1413  static int yy_get_next_buffer (void)
         yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];          yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
         yy_is_jam = (yy_current_state == 120);          yy_is_jam = (yy_current_state == 120);
   
        return yy_is_jam ? 0 : yy_current_state;                return yy_is_jam ? 0 : yy_current_state;
 }  }
   
 #ifndef YY_NO_INPUT  #ifndef YY_NO_INPUT
Line 1453  static int yy_get_next_buffer (void) Line 1440  static int yy_get_next_buffer (void)
   
                 else                  else
                         { /* need more input */                          { /* need more input */
                        int offset = (yy_c_buf_p) - (yytext_ptr);                        yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
                         ++(yy_c_buf_p);                          ++(yy_c_buf_p);
   
                         switch ( yy_get_next_buffer(  ) )                          switch ( yy_get_next_buffer(  ) )
Line 1613  static void __libipsec_load_buffer_state  (void) Line 1600  static void __libipsec_load_buffer_state  (void)
         __libipsecfree((void *) b  );          __libipsecfree((void *) b  );
 }  }
   
 #ifndef __cplusplus  
 extern int isatty (int );  
 #endif /* __cplusplus */  
       
 /* Initializes or reinitializes a buffer.  /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,   * This function is sometimes called more than once on the same buffer,
  * such as during a __libipsecrestart() or at EOF.   * such as during a __libipsecrestart() or at EOF.
Line 1729  void __libipsecpop_buffer_state (void) Line 1712  void __libipsecpop_buffer_state (void)
  */   */
 static void __libipsecensure_buffer_stack (void)  static void __libipsecensure_buffer_stack (void)
 {  {
        int num_to_alloc;        yy_size_t num_to_alloc;
           
         if (!(yy_buffer_stack)) {          if (!(yy_buffer_stack)) {
   
Line 1826  YY_BUFFER_STATE __libipsec_scan_string (yyconst char * Line 1809  YY_BUFFER_STATE __libipsec_scan_string (yyconst char *
  *    * 
  * @return the newly allocated buffer state object.   * @return the newly allocated buffer state object.
  */   */
YY_BUFFER_STATE __libipsec_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )YY_BUFFER_STATE __libipsec_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {  {
         YY_BUFFER_STATE b;          YY_BUFFER_STATE b;
         char *buf;          char *buf;
Line 1913  FILE *__libipsecget_out  (void) Line 1896  FILE *__libipsecget_out  (void)
 /** Get the length of the current token.  /** Get the length of the current token.
  *    * 
  */   */
int __libipsecget_leng  (void)yy_size_t __libipsecget_leng  (void)
 {  {
         return __libipsecleng;          return __libipsecleng;
 }  }

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>