[asterisk-commits] kpfleming: trunk r43900 - in /trunk: ./
main/cli.c
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Sep 28 09:43:41 MST 2006
Author: kpfleming
Date: Thu Sep 28 11:43:40 2006
New Revision: 43900
URL: http://svn.digium.com/view/asterisk?rev=43900&view=rev
Log:
Merged revisions 43898 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r43898 | kpfleming | 2006-09-28 11:38:25 -0500 (Thu, 28 Sep 2006) | 10 lines
Merged revisions 43895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43895 | kpfleming | 2006-09-28 11:32:44 -0500 (Thu, 28 Sep 2006) | 2 lines
eliminate compiler warning introduced by recent changes
........
................
Modified:
trunk/ (props changed)
trunk/main/cli.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/main/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cli.c?rev=43900&r1=43899&r2=43900&view=diff
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Thu Sep 28 11:43:40 2006
@@ -743,7 +743,7 @@
c->fout & ~DEBUGCHAN_FLAG, (c->fout & DEBUGCHAN_FLAG) ? " (DEBUGGED)" : "",
(long)c->whentohangup,
cdrtime, c->_bridge ? c->_bridge->name : "<none>", ast_bridged_channel(c) ? ast_bridged_channel(c)->name : "<none>",
- c->context, c->exten, c->priority, c->callgroup, c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ),
+ c->context, c->exten, c->priority, (int) c->callgroup, (int) c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ),
( c-> data ? S_OR(c->data, "(Empty)") : "(None)"),
(ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));
More information about the asterisk-commits
mailing list