[svn-commits] murf: branch murf/bug8221 r47984 - in
/team/murf/bug8221: include/asterisk/ m...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Nov 23 19:49:42 MST 2006
Author: murf
Date: Thu Nov 23 20:49:42 2006
New Revision: 47984
URL: http://svn.digium.com/view/asterisk?view=rev&rev=47984
Log:
Added some minor updates, calmed down compiler warning, got rid of useless routines
Modified:
team/murf/bug8221/include/asterisk/cdr.h
team/murf/bug8221/main/cdr.c
team/murf/bug8221/main/channel.c
team/murf/bug8221/res/res_features.c
Modified: team/murf/bug8221/include/asterisk/cdr.h
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221/include/asterisk/cdr.h?view=diff&rev=47984&r1=47983&r2=47984
==============================================================================
--- team/murf/bug8221/include/asterisk/cdr.h (original)
+++ team/murf/bug8221/include/asterisk/cdr.h Thu Nov 23 20:49:42 2006
@@ -272,11 +272,6 @@
*/
char *ast_cdr_flags2str(int flags);
-/*! a quick test to see if anything interesting has been put in a CDR record
- * \param cdr the cdr to evaluate
- */
-int ast_cdr_has_info(struct ast_cdr *cdr);
-
/*! Move the non-null data from the "from" cdr to the "to" cdr
* \param to the cdr to get the goodies
* \param from the cdr to give the goodies
Modified: team/murf/bug8221/main/cdr.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221/main/cdr.c?view=diff&rev=47984&r1=47983&r2=47984
==============================================================================
--- team/murf/bug8221/main/cdr.c (original)
+++ team/murf/bug8221/main/cdr.c Thu Nov 23 20:49:42 2006
@@ -533,15 +533,6 @@
/* amaflags, flags, varsead, dst, src? */
}
-int ast_cdr_has_info(struct ast_cdr *cdr)
-{
- if (!ast_tvzero(cdr->start) || !ast_tvzero(cdr->answer) || !ast_tvzero(cdr->end))
- return 1;
- if (cdr->disposition != AST_CDR_NOANSWER)
- return 1;
- return 0;
-}
-
void ast_cdr_start(struct ast_cdr *cdr)
{
char *chan;
Modified: team/murf/bug8221/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221/main/channel.c?view=diff&rev=47984&r1=47983&r2=47984
==============================================================================
--- team/murf/bug8221/main/channel.c (original)
+++ team/murf/bug8221/main/channel.c Thu Nov 23 20:49:42 2006
@@ -1643,11 +1643,11 @@
if (chan->tech->answer)
res = chan->tech->answer(chan);
ast_setstate(chan, AST_STATE_UP);
- ast_log(LOG_NOTICE,"posting Answer time to (ast_answer.ring) channel %s:%x\n", chan->name, chan->cdr);
+ ast_log(LOG_NOTICE,"posting Answer time to (ast_answer.ring) channel %s:%x\n", chan->name, (int)chan->cdr);
ast_cdr_answer(chan->cdr);
break;
case AST_STATE_UP:
- ast_log(LOG_NOTICE,"posting Answer time to (ast_answer.up) channel %s:%x\n", chan->name, chan->cdr);
+ ast_log(LOG_NOTICE,"posting Answer time to (ast_answer.up) channel %s:%x\n", chan->name, (int)chan->cdr);
ast_cdr_answer(chan->cdr);
break;
default:
@@ -2123,7 +2123,7 @@
} else {
/* Answer the CDR */
ast_setstate(chan, AST_STATE_UP);
- ast_log(LOG_NOTICE,"posting Answer time to (__ast_read.answer) channel %s:%x\n", chan->name, chan->cdr);
+ ast_log(LOG_NOTICE,"posting Answer time to (__ast_read.answer) channel %s:%x\n", chan->name, (int)chan->cdr);
if (!chan->cdr) { /* up till now, this insertion hasn't been done. Therefore,
to keep from throwing off the basic order of the universe,
we will try to keep this cdr from getting posted. */
Modified: team/murf/bug8221/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8221/res/res_features.c?view=diff&rev=47984&r1=47983&r2=47984
==============================================================================
--- team/murf/bug8221/res/res_features.c (original)
+++ team/murf/bug8221/res/res_features.c Thu Nov 23 20:49:42 2006
@@ -1370,17 +1370,17 @@
chan->cdr->channel,
chan->cdr->dstchannel,
chan->cdr->lastapp,
- chan->cdr->start.tv_sec,
- chan->cdr->answer.tv_sec,
- chan->cdr->end.tv_sec,
- chan->cdr->disposition);
+ (int)chan->cdr->start.tv_sec,
+ (int)chan->cdr->answer.tv_sec,
+ (int)chan->cdr->end.tv_sec,
+ (int)chan->cdr->disposition);
ast_log(LOG_NOTICE,"peer.cdr.name=%s, .dstchan=%s, .lastapp=%s, .start=%d, .answer=%d, .end=%d, .dispos=%d\n", peer->cdr->channel,
peer->cdr->dstchannel,
peer->cdr->lastapp,
- peer->cdr->start.tv_sec,
- peer->cdr->answer.tv_sec,
- peer->cdr->end.tv_sec,
- peer->cdr->disposition);
+ (int)peer->cdr->start.tv_sec,
+ (int)peer->cdr->answer.tv_sec,
+ (int)peer->cdr->end.tv_sec,
+ (int)peer->cdr->disposition);
ast_cdr_init(bridge_object.cdr,chan); /* seems more logicaller to use the destination as a base, but, really, it's random */
ast_cdr_start(bridge_object.cdr); /* now is the time to start */
/* absorb the channel cdr */
@@ -1388,10 +1388,10 @@
ast_log(LOG_NOTICE,"Discarding answered chan cdr.name=%s, .dstchan=%s, .lastapp=%s, .start=%d, .answer=%d, .end=%d, .dispos=%d\n", chan->cdr->channel,
chan->cdr->dstchannel,
chan->cdr->lastapp,
- chan->cdr->start.tv_sec,
- chan->cdr->answer.tv_sec,
- chan->cdr->end.tv_sec,
- chan->cdr->disposition);
+ (int)chan->cdr->start.tv_sec,
+ (int)chan->cdr->answer.tv_sec,
+ (int)chan->cdr->end.tv_sec,
+ (int)chan->cdr->disposition);
ast_cdr_discard(chan->cdr); /* no posting these guys */
chan->cdr = NULL;
@@ -1400,10 +1400,10 @@
ast_log(LOG_NOTICE,"Discarding answered peer cdr.name=%s, .dstchan=%s, .lastapp=%s, .start=%d, .answer=%d, .end=%d, .dispos=%d\n", peer->cdr->channel,
peer->cdr->dstchannel,
peer->cdr->lastapp,
- peer->cdr->start.tv_sec,
- peer->cdr->answer.tv_sec,
- peer->cdr->end.tv_sec,
- peer->cdr->disposition);
+ (int)peer->cdr->start.tv_sec,
+ (int)peer->cdr->answer.tv_sec,
+ (int)peer->cdr->end.tv_sec,
+ (int)peer->cdr->disposition);
ast_cdr_discard(peer->cdr); /* no posting these guys */
peer->cdr = NULL;
} else if (chan->cdr) {
@@ -1626,10 +1626,10 @@
ast_log(LOG_NOTICE,"Posting Bridged chan cdr.name=%s, .dstchan=%s, .lastapp=%s, .start=%d, .answer=%d, .end=%d, .dispos=%d\n", bridge_object.cdr->channel,
bridge_object.cdr->dstchannel,
bridge_object.cdr->lastapp,
- bridge_object.cdr->start.tv_sec,
- bridge_object.cdr->answer.tv_sec,
- bridge_object.cdr->end.tv_sec,
- bridge_object.cdr->disposition);
+ (int)bridge_object.cdr->start.tv_sec,
+ (int)bridge_object.cdr->answer.tv_sec,
+ (int)bridge_object.cdr->end.tv_sec,
+ (int)bridge_object.cdr->disposition);
ast_cdr_detach(bridge_object.cdr);
bridge_object.cdr = NULL;
ast_cdr_discard(chan->cdr); /* no posting these guys */
More information about the svn-commits
mailing list