mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
deal with more gcc 4.2 const pointer warnings
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83978 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -201,7 +201,7 @@ extern char *my_file;
|
|||||||
#ifdef AAL_ARGCHECK
|
#ifdef AAL_ARGCHECK
|
||||||
int ael_is_funcname(char *name);
|
int ael_is_funcname(char *name);
|
||||||
#endif
|
#endif
|
||||||
static char *ael_token_subst(char *mess);
|
static char *ael_token_subst(const char *mess);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -3269,11 +3269,11 @@ static char *token_equivs2[] =
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static char *ael_token_subst(char *mess)
|
static char *ael_token_subst(const char *mess)
|
||||||
{
|
{
|
||||||
/* calc a length, malloc, fill, and return; yyerror had better free it! */
|
/* calc a length, malloc, fill, and return; yyerror had better free it! */
|
||||||
int len=0,i;
|
int len=0,i;
|
||||||
char *p;
|
const char *p;
|
||||||
char *res, *s,*t;
|
char *res, *s,*t;
|
||||||
int token_equivs_entries = sizeof(token_equivs1)/sizeof(char*);
|
int token_equivs_entries = sizeof(token_equivs1)/sizeof(char*);
|
||||||
|
|
||||||
@@ -3314,7 +3314,7 @@ static char *ael_token_subst(char *mess)
|
|||||||
|
|
||||||
void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s)
|
void yyerror(YYLTYPE *locp, struct parse_io *parseio, char const *s)
|
||||||
{
|
{
|
||||||
char *s2 = ael_token_subst((char *)s);
|
char *s2 = ael_token_subst(s);
|
||||||
if (locp->first_line == locp->last_line) {
|
if (locp->first_line == locp->last_line) {
|
||||||
ast_log(LOG_ERROR, "==== File: %s, Line %d, Cols: %d-%d: Error: %s\n", my_file, locp->first_line, locp->first_column, locp->last_column, s2);
|
ast_log(LOG_ERROR, "==== File: %s, Line %d, Cols: %d-%d: Error: %s\n", my_file, locp->first_line, locp->first_column, locp->last_column, s2);
|
||||||
} else {
|
} else {
|
||||||
|
@@ -46,7 +46,7 @@ extern char *my_file;
|
|||||||
#ifdef AAL_ARGCHECK
|
#ifdef AAL_ARGCHECK
|
||||||
int ael_is_funcname(char *name);
|
int ael_is_funcname(char *name);
|
||||||
#endif
|
#endif
|
||||||
static char *ael_token_subst(char *mess);
|
static char *ael_token_subst(const char *mess);
|
||||||
|
|
||||||
%}
|
%}
|
||||||
|
|
||||||
@@ -714,11 +714,11 @@ static char *token_equivs2[] =
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static char *ael_token_subst(char *mess)
|
static char *ael_token_subst(const char *mess)
|
||||||
{
|
{
|
||||||
/* calc a length, malloc, fill, and return; yyerror had better free it! */
|
/* calc a length, malloc, fill, and return; yyerror had better free it! */
|
||||||
int len=0,i;
|
int len=0,i;
|
||||||
char *p;
|
const char *p;
|
||||||
char *res, *s,*t;
|
char *res, *s,*t;
|
||||||
int token_equivs_entries = sizeof(token_equivs1)/sizeof(char*);
|
int token_equivs_entries = sizeof(token_equivs1)/sizeof(char*);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user