Update of /usr/cvsroot/asterisk In directory mongoose.digium.com:/tmp/cvs-serv19065
Modified Files: ChangeLog cli.c Log Message: issue #5804 Index: ChangeLog =================================================================== RCS file: /usr/cvsroot/asterisk/ChangeLog,v retrieving revision 1.162 retrieving revision 1.163 diff -u -d -r1.162 -r1.163 --- ChangeLog 21 Nov 2005 01:11:40 -0000 1.162 +++ ChangeLog 21 Nov 2005 01:21:39 -0000 1.163 @@ -1,5 +1,7 @@ 2005-11-20 Russell Bryant <[EMAIL PROTECTED]> + * cli.c: Remove some unnecessary calls to ast_strlen_zero(). (issue #5804) + * channels/chan_oss.c configs/oss.conf.sample: Add the ability to set callerid in oss.conf. * channels/chan_sip.c channels/chan_iax2.c: Change warning messages about the number of scheduled events happening all at once to debug messages. (issue #5794) Index: cli.c =================================================================== RCS file: /usr/cvsroot/asterisk/cli.c,v retrieving revision 1.103 retrieving revision 1.104 diff -u -d -r1.103 -r1.104 --- cli.c 5 Nov 2005 18:58:27 -0000 1.103 +++ cli.c 21 Nov 2005 01:21:39 -0000 1.104 @@ -460,15 +460,15 @@ } if (concise) { ast_cli(fd, CONCISE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), - c->appl ? c->appl : "(None)", c->data ? ( !ast_strlen_zero(c->data) ? c->data : "" ): "", - (c->cid.cid_num && !ast_strlen_zero(c->cid.cid_num)) ? c->cid.cid_num : "", - (c->accountcode && !ast_strlen_zero(c->accountcode)) ? c->accountcode : "", c->amaflags, + c->appl ? c->appl : "(None)", c->data ? c->data : "", + c->cid.cid_num ? c->cid.cid_num : "", + c->accountcode ? c->accountcode : "", c->amaflags, durbuf, bc ? bc->name : "(None)"); } else if (verbose) { ast_cli(fd, VERBOSE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), c->appl ? c->appl : "(None)", c->data ? ( !ast_strlen_zero(c->data) ? c->data : "(Empty)" ): "(None)", - (c->cid.cid_num && !ast_strlen_zero(c->cid.cid_num)) ? c->cid.cid_num : "", durbuf, - (c->accountcode && !ast_strlen_zero(c->accountcode)) ? c->accountcode : "", bc ? bc->name : "(None)"); + c->cid.cid_num ? c->cid.cid_num : "", durbuf, + c->accountcode ? c->accountcode : "", bc ? bc->name : "(None)"); } else { if (!ast_strlen_zero(c->context) && !ast_strlen_zero(c->exten)) snprintf(locbuf, sizeof(locbuf), "[EMAIL PROTECTED]:%d", c->exten, c->context, c->priority); _______________________________________________ Asterisk-Cvs mailing list Asterisk-Cvs@lists.digium.com http://lists.digium.com/mailman/listinfo/asterisk-cvs