kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 15:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

uncomment some functions in the flex code that were actually

Browse Source 
used in the bison code - detected by making aelparse compile
again.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-27 00:05:05 +00:00
parent a857016551
commit d19f767c3c
4 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pbx/ael/ael.flex
View File

@@ -36,7 +36,7 @@ static int parencount = 0;
static int commaout = 0; static int commaout = 0;
static int my_lineno = 1; static int my_lineno = 1;
static int my_col = 0; static int my_col = 0;
static char *my_file = 0; char *my_file = 0; /* used also in the bison code */
char *prev_word; char *prev_word;
#define MAX_INCLUDE_DEPTH 50 #define MAX_INCLUDE_DEPTH 50
@@ -544,8 +544,9 @@ static int pbcpop(char x)
return 1; /* error */ return 1; /* error */
} }
#if 0 /* used by the bison code */
static int c_prevword(void) int c_prevword(void);
int c_prevword(void)
{ {
char *c = prev_word; char *c = prev_word;
int ret = 0; int ret = 0;
@@ -564,7 +565,6 @@ static int c_prevword(void)
} }
return 0; return 0;
} }
#endif
/* compute the total number of lines and columns in the text /* compute the total number of lines and columns in the text
* passed as argument. * passed as argument.
@@ -586,8 +586,9 @@ static void pbcwhere(const char *text, int *line, int *col )
*col = loc_col; *col = loc_col;
} }
#if 0 /* used by the bison code */
static void reset_parencount(yyscan_t yyscanner ) void reset_parencount(yyscan_t yyscanner );
void reset_parencount(yyscan_t yyscanner )
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
parencount = 0; parencount = 0;
@@ -597,14 +598,18 @@ static void reset_parencount(yyscan_t yyscanner )
BEGIN(paren); BEGIN(paren);
} }
static void reset_semicount(yyscan_t yyscanner ) /* used by the bison code */
void reset_semicount(yyscan_t yyscanner );
void reset_semicount(yyscan_t yyscanner )
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
pbcpos = 0; pbcpos = 0;
BEGIN(semic); BEGIN(semic);
} }
static void reset_argcount(yyscan_t yyscanner ) /* used by the bison code */
void reset_argcount(yyscan_t yyscanner );
void reset_argcount(yyscan_t yyscanner )
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
parencount = 0; parencount = 0;
@@ -615,8 +620,6 @@ static void reset_argcount(yyscan_t yyscanner )
BEGIN(argg); BEGIN(argg);
} }
#endif
/* used elsewhere, but some local vars */ /* used elsewhere, but some local vars */
struct pval *ael2_parse(char *filename, int *errors) struct pval *ael2_parse(char *filename, int *errors)
{ {

23
pbx/ael/ael_lex.c
View File

@@ -671,7 +671,7 @@ static int parencount = 0;
static int commaout = 0; static int commaout = 0;
static int my_lineno = 1; static int my_lineno = 1;
static int my_col = 0; static int my_col = 0;
static char *my_file = 0; char *my_file = 0; /* used also in the bison code */
char *prev_word; char *prev_word;
#define MAX_INCLUDE_DEPTH 50 #define MAX_INCLUDE_DEPTH 50
@@ -2895,8 +2895,9 @@ static int pbcpop(char x)
return 1; /* error */ return 1; /* error */
} }
#if 0 /* used by the bison code */
static int c_prevword(void) int c_prevword(void);
int c_prevword(void)
{ {
char *c = prev_word; char *c = prev_word;
int ret = 0; int ret = 0;
@@ -2915,7 +2916,6 @@ static int c_prevword(void)
} }
return 0; return 0;
} }
#endif
/* compute the total number of lines and columns in the text /* compute the total number of lines and columns in the text
* passed as argument. * passed as argument.
@@ -2937,8 +2937,9 @@ static void pbcwhere(const char *text, int *line, int *col )
*col = loc_col; *col = loc_col;
} }
#if 0 /* used by the bison code */
static void reset_parencount(yyscan_t yyscanner ) void reset_parencount(yyscan_t yyscanner );
void reset_parencount(yyscan_t yyscanner )
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
parencount = 0; parencount = 0;
@@ -2948,14 +2949,18 @@ static void reset_parencount(yyscan_t yyscanner )
BEGIN(paren); BEGIN(paren);
} }
static void reset_semicount(yyscan_t yyscanner ) /* used by the bison code */
void reset_semicount(yyscan_t yyscanner );
void reset_semicount(yyscan_t yyscanner )
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
pbcpos = 0; pbcpos = 0;
BEGIN(semic); BEGIN(semic);
} }
static void reset_argcount(yyscan_t yyscanner ) /* used by the bison code */
void reset_argcount(yyscan_t yyscanner );
void reset_argcount(yyscan_t yyscanner )
{ {
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
parencount = 0; parencount = 0;
@@ -2966,8 +2971,6 @@ static void reset_argcount(yyscan_t yyscanner )
BEGIN(argg); BEGIN(argg);
} }
#endif
/* used elsewhere, but some local vars */ /* used elsewhere, but some local vars */
struct pval *ael2_parse(char *filename, int *errors) struct pval *ael2_parse(char *filename, int *errors)
{ {

4
utils/Makefile
View File

@@ -14,7 +14,7 @@
# #
# Don't use ast mm routines # Don't use ast mm routines
# #
UTILS:=astman smsq stereorize streamplayer UTILS:=astman smsq stereorize streamplayer aelparse
ifeq (${OSARCH},SunOS) ifeq (${OSARCH},SunOS)
SOL=../strcompat.o SOL=../strcompat.o
@@ -70,7 +70,7 @@ aelparse : ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o ael_main.
$(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ../ast_expr2f.o ../ast_expr2.o $(CC) $(CFLAGS) -g -o aelparse ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ael_main.o ../pbx/pbx_ael.o ../ast_expr2f.o ../ast_expr2.o
ael_main.o : ael_main.c ../include/asterisk/ael_structs.h ael_main.o : ael_main.c ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -c -g -o ael_main.o ael_main.c $(CC) $(CFLAGS) -include ../include/autoconfig.h -c -g -o ael_main.o ael_main.c
ael_main1.o : ael_main.c ../include/asterisk/ael_structs.h ael_main1.o : ael_main.c ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -c -g -o ael_main1.o ael_main.c $(CC) $(CFLAGS) -c -g -o ael_main1.o ael_main.c

12
utils/ael_main.c
View File

@@ -6,17 +6,15 @@
#include <ctype.h> #include <ctype.h>
#if !defined(SOLARIS) && !defined(__CYGWIN__) #if !defined(SOLARIS) && !defined(__CYGWIN__)
#include <err.h> #include <err.h>
#else
#define quad_t int64_t
#endif #endif
#include <errno.h> #include <errno.h>
#include <regex.h> #include <regex.h>
#include <limits.h> #include <limits.h>
#include <asterisk/ast_expr.h> #include "asterisk/ast_expr.h"
#include <asterisk/logger.h> #include "asterisk/logger.h"
#include <asterisk/module.h> #include "asterisk/module.h"
#include <asterisk/channel.h> #include "asterisk/channel.h"
#include <asterisk/app.h> #include "asterisk/app.h"
#include "asterisk/ael_structs.h" #include "asterisk/ael_structs.h"
#define AST_CONFIG_MAX_PATH 255 #define AST_CONFIG_MAX_PATH 255