From 2e78cacbc154a45ef5abe53a9767c4739aded58b Mon Sep 17 00:00:00 2001 From: David Vossel Date: Thu, 25 Jun 2009 21:46:46 +0000 Subject: [PATCH] Merged revisions 203444 via svnmerge from 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 --- main/ast_expr2.c | 1 - main/ast_expr2.fl | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/main/ast_expr2.c b/main/ast_expr2.c index 068e47acd0..44b0b7ece8 100644 --- a/main/ast_expr2.c +++ b/main/ast_expr2.c @@ -2415,7 +2415,6 @@ static void free_value (struct val *vp) { if (vp==NULL) { - free(vp); return; } if (vp->type == AST_EXPR_string || vp->type == AST_EXPR_numeric_string) diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 499706811f..c2e39be0c1 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -243,10 +243,10 @@ int ast_yyerror(const char *, YYLTYPE *, struct parse_io *); /* likewise */ void ast_yyfree(void *ptr, yyscan_t yyscanner) { - if (ptr) /* the normal generated yyfree func just frees its first arg; - this get complaints on some systems, as sometimes this - arg is a nil ptr! It's usually not fatal, but is irritating! */ - free( (char *) ptr ); + /* the normal generated yyfree func just frees its first arg; + this get complaints on some systems, as sometimes this + arg is a nil ptr! It's usually not fatal, but is irritating! */ + free( (char *) ptr ); } 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 buf[0] = 0; return_value = strlen(buf); - if (io.val->u.s) - free(io.val->u.s); + free(io.val->u.s); } free(io.val); }