Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv14656/apps
Modified Files:
app_queue.c app_voicemail.c app_zapscan.c
Log Message:
issue #5648
Index: app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- app_queue.c 7 Nov 2005 22:01:22 -0000 1.177
+++ app_queue.c 8 Nov 2005 01:55:30 -0000 1.178
@@ -2022,7 +2022,7 @@
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 @@
}
/* 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);
Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- app_voicemail.c 7 Nov 2005 22:01:22 -0000 1.263
+++ app_voicemail.c 8 Nov 2005 01:55:30 -0000 1.264
@@ -3658,7 +3658,7 @@
/* 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++){
Index: app_zapscan.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_zapscan.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- app_zapscan.c 6 Nov 2005 15:09:46 -0000 1.24
+++ app_zapscan.c 8 Nov 2005 01:55:30 -0000 1.25
@@ -305,7 +305,8 @@
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;
}
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
