diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-21 14:49:21 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-21 14:49:21 +0000 |
commit | 0dbf814a79fc82b99d14cade9ead82540c8fe6dc (patch) | |
tree | 0610219ce014fe270f72ed2014a957fd3a329a73 /cli.c | |
parent | e61e34e8a1832e4dcf64957d6cf6723f54c735fd (diff) |
- use symbolic constants and macros to play with the debug flag
on the frame counters. Document it in the header file.
- provide a single exit point for a function;
- mark XXX some unclear parts of the code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cli.c')
-rw-r--r-- | cli.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -626,7 +626,6 @@ static int handle_debuglevel(int fd, int argc, char *argv[]) return RESULT_SUCCESS; } -#define DEBUGCHAN_FLAG 0x80000000 /* XXX todo: merge next two functions!!! */ static int handle_debugchan(int fd, int argc, char *argv[]) { @@ -756,8 +755,10 @@ static int handle_showchan(int fd, int argc, char *argv[]) ast_getformatname_multiple(nf, sizeof(nf), c->nativeformats), ast_getformatname_multiple(wf, sizeof(wf), c->writeformat), ast_getformatname_multiple(rf, sizeof(rf), c->readformat), - c->fds[0], c->fin & 0x7fffffff, (c->fin & 0x80000000) ? " (DEBUGGED)" : "", - c->fout & 0x7fffffff, (c->fout & 0x80000000) ? " (DEBUGGED)" : "", (long)c->whentohangup, + c->fds[0], + c->fin & ~DEBUGCHAN_FLAG, (c->fin & DEBUGCHAN_FLAG) ? " (DEBUGGED)" : "", + 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-> data ? S_OR(c->data, "(Empty)") : "(None)"), |