kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 01:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 203444 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r203444 | dvossel | 2009-06-25 16:45:32 -0500 (Thu, 25 Jun 2009) | 4 lines
  
  fixes a few redundant conditions
  
  (issue #15269)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@203446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-06-25 21:46:46 +00:00
parent f70f6594f3
commit 2e78cacbc1
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/ast_expr2.c
View File

@@ -2415,7 +2415,6 @@ static void
free_value (struct val *vp) free_value (struct val *vp)
{ {
if (vp==NULL) { if (vp==NULL) {
free(vp);
return; return;
} }
if (vp->type == AST_EXPR_string || vp->type == AST_EXPR_numeric_string) if (vp->type == AST_EXPR_string || vp->type == AST_EXPR_numeric_string)

11
main/ast_expr2.fl
View File

@@ -243,10 +243,10 @@ int ast_yyerror(const char *, YYLTYPE *, struct parse_io *); /* likewise */
void ast_yyfree(void *ptr, yyscan_t yyscanner) void ast_yyfree(void *ptr, yyscan_t yyscanner)
{ {
if (ptr) /* the normal generated yyfree func just frees its first arg; /* the normal generated yyfree func just frees its first arg;
this get complaints on some systems, as sometimes this this get complaints on some systems, as sometimes this
arg is a nil ptr! It's usually not fatal, but is irritating! */ arg is a nil ptr! It's usually not fatal, but is irritating! */
free( (char *) ptr ); free( (char *) ptr );
} }
int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan) int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan)
@@ -287,8 +287,7 @@ int ast_expr(char *expr, char *buf, int length, struct ast_channel *chan)
else else
buf[0] = 0; buf[0] = 0;
return_value = strlen(buf); return_value = strlen(buf);
if (io.val->u.s) free(io.val->u.s);
free(io.val->u.s);
} }
free(io.val); free(io.val);
} }