issue #5648

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7011 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 5 insertions, 4 deletions

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 7fcffd71c..ae622f05a 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2022,7 +2022,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 	cur = qe->parent->members;
 	if (!ast_strlen_zero(qe->announce))
 		announce = qe->announce;
-	if (announceoverride && !ast_strlen_zero(announceoverride))
+	if (!ast_strlen_zero(announceoverride))
 		announce = announceoverride;
 
 	while(cur) {
@@ -2201,7 +2201,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 		}
 		/* Drop out of the queue at this point, to prepare for next caller */
 		leave_queue(qe);			
- 		if (url && !ast_strlen_zero(url) && ast_channel_supports_html(peer)) {
+ 		if (!ast_strlen_zero(url) && ast_channel_supports_html(peer)) {
 			if (option_debug)
 	 			ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url);
  			ast_channel_sendurl(peer, url);
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index c6c6f8ae7..f12b3b8a8 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3658,7 +3658,7 @@ static int play_message_callerid(struct ast_channel *chan, struct vm_state *vms,
 	/* Strip off caller ID number from name */
 	ast_log(LOG_DEBUG, "VM-CID: composite caller ID received: %s, context: %s\n", cid, context);
 	ast_callerid_parse(cid, &name, &callerid);
-	if ((callerid != NULL)&&(!res)&&(!ast_strlen_zero(callerid))){
+	if ((!res)&&(!ast_strlen_zero(callerid))){
 		/* Check for internal contexts and only */
 		/* say extension when the call didn't come from an internal context in the list */
 		for (i = 0 ; i < MAX_NUM_CID_CONTEXTS ; i++){
diff --git a/apps/app_zapscan.c b/apps/app_zapscan.c
index f016cb514..a199d4e02 100755
--- a/apps/app_zapscan.c
+++ b/apps/app_zapscan.c
@@ -305,7 +305,8 @@ static int conf_exec(struct ast_channel *chan, void *data)
 	if (chan->_state != AST_STATE_UP)
 		ast_answer(chan);
 	
-	if((desired_group = ast_strdupa((char *) data)) && !ast_strlen_zero(desired_group)) {
+	desired_group = ast_strdupa((char *) data);
+	if(!ast_strlen_zero(desired_group)) {
 		ast_verbose(VERBOSE_PREFIX_3 "Scanning for group %s\n", desired_group);
 		search_group = 1;
 	}