From 8677abe99b50bd407f05ffc16bba2b93d3ac4f01 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" <kpfleming@digium.com> Date: Thu, 28 Sep 2006 16:43:40 +0000 Subject: [PATCH] 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43900 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/cli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/cli.c b/main/cli.c index d45e3ff4e0..a5225e7b4e 100644 --- a/main/cli.c +++ b/main/cli.c @@ -743,7 +743,7 @@ static int handle_showchan(int fd, int argc, char *argv[]) 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)")); -- GitLab