[asterisk-commits] jrothenberger: branch jrothenberger/asterisk-urgent r104755 - /team/jrothenbe...

[SVN commits to the Asterisk project]

Author: jrothenberger
Date: Wed Feb 27 12:55:29 2008
New Revision: 104755

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104755
Log:
Some minor ast_strlen_zero checks added.


Modified:
    team/jrothenberger/asterisk-urgent/apps/app_voicemail.c

Modified: team/jrothenberger/asterisk-urgent/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/jrothenberger/asterisk-urgent/apps/app_voicemail.c?view=diff&rev=104755&r1=104754&r2=104755
==============================================================================
--- team/jrothenberger/asterisk-urgent/apps/app_voicemail.c (original)
+++ team/jrothenberger/asterisk-urgent/apps/app_voicemail.c Wed Feb 27 12:55:29 2008
@@ -4903,12 +4903,13 @@
 	save_body(body, vms, "2", attachedfilefmt);
 
 	adsi_message(chan, vms);
+	ast_debug(5,"**************  About to check urgent flag, set to:%s\n", flag);
 	if (!vms->curmsg)
 		res = wait_file2(chan, vms, "vm-first");	/* "First" */
 	else if (vms->curmsg == vms->lastmsg)
 		res = wait_file2(chan, vms, "vm-last");		/* "last" */
 	/* Play the word urgent if we are listening to urgent messages */
-	if (flag && strncmp(flag,"URGENT",6) == 0) {
+	if (!ast_strlen_zero(flag) && strncmp(flag,"URGENT",6) == 0) {
 		res = wait_file2(chan, vms, "vm-URGENT");	/* "urgent" */
 	}
 
@@ -5017,7 +5018,7 @@
 	flag = ast_variable_retrieve(msg_cfg, "message", "flag");
 
 	/* Play the word urgent if we are listening to urgent messages */
-	if (flag && strcmp(flag,"URGENT") == 0) {
+	if (!ast_strlen_zero(flag) && strcmp(flag,"URGENT") == 0) {
 		res = wait_file2(chan, vms, "vm-URGENT");	/* "urgent" */
 	}
 
@@ -5066,7 +5067,7 @@
 	}
 
 	/* URGENT has a carriage return on the end, so don't compare that */
-	if (flag && strcmp(flag,"URGENT") == 0) {
+	if (!ast_strlen_zero(flag) && strcmp(flag,"URGENT") == 0) {
 		res = wait_file2(chan, vms, "vm-marked-urgent");
 	}