fixes a few redundant conditions

(issue #15269)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203444 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 5 insertions, 6 deletions

diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index 98d2ea5c4..c47bdced9 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);
 	}