[asterisk-commits] murf: branch group/newcdr r115943 - in /team/group/newcdr: cel/ main/

[SVN commits to the Asterisk project]

Author: murf
Date: Tue May 13 15:22:06 2008
New Revision: 115943

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115943
Log:
fixes for 64-bit

Modified:
    team/group/newcdr/cel/cel_pgsql.c
    team/group/newcdr/main/cel.c
    team/group/newcdr/main/features.c

Modified: team/group/newcdr/cel/cel_pgsql.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/cel/cel_pgsql.c?view=diff&rev=115943&r1=115942&r2=115943
==============================================================================
--- team/group/newcdr/cel/cel_pgsql.c (original)
+++ team/group/newcdr/cel/cel_pgsql.c Tue May 13 15:22:06 2008
@@ -130,7 +130,7 @@
 	}
 
 	if (connected) {
-		char *cidname_esc=NULL, *exten_esc, *context_esc=NULL, *channel_esc=NULL, *app_esc=NULL, *appdata_esc=NULL, *linkedid_esc=NULL;
+		char *cidname_esc=NULL, *exten_esc=NULL, *context_esc=NULL, *channel_esc=NULL, *app_esc=NULL, *appdata_esc=NULL, *linkedid_esc=NULL;
 		char *uniqueid_esc=NULL, *cidnum_esc=NULL, *cidani_esc=NULL, *cidrdnis_esc=NULL, *ciddnid_esc=NULL, *accountcode_esc, *userfield_esc, *peer_esc;
 
 		/* Maximum space needed would be if all characters needed to be escaped, plus a trailing NULL */

Modified: team/group/newcdr/main/cel.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/main/cel.c?view=diff&rev=115943&r1=115942&r2=115943
==============================================================================
--- team/group/newcdr/main/cel.c (original)
+++ team/group/newcdr/main/cel.c Tue May 13 15:22:06 2008
@@ -507,7 +507,7 @@
 		struct ast_var_t *variables;
 		struct varshead *headp = &chan->varshead;
 		const char *t2=0;
-		struct timeval tv2;
+		struct timeval tv2={0};
 		
 		AST_LIST_TRAVERSE(headp, variables, entries) {
 			if (!strcasecmp(name, ast_var_name(variables))) {

Modified: team/group/newcdr/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/main/features.c?view=diff&rev=115943&r1=115942&r2=115943
==============================================================================
--- team/group/newcdr/main/features.c (original)
+++ team/group/newcdr/main/features.c Tue May 13 15:22:06 2008
@@ -2050,12 +2050,12 @@
                        chan->name, chan->appl, chan->data, chan->context, chan->exten, chan->priority);
        ast_log(LOG_NOTICE, "CHAN: acctcode: %s;  dialcontext: %s; amaflags: %x; maccontxt: %s;  macexten: %s; macpri: %d;\n",
                        chan->accountcode, chan->dialcontext, chan->amaflags, chan->macrocontext, chan->macroexten, chan->macropriority);
-       ast_log(LOG_NOTICE, "CHAN: masq: %x;  masqr: %x; _bridge: %x; uniqueID: %s; linkedID:%s\n",
-                       (unsigned int)chan->masq, (unsigned int)chan->masqr,
-                       (unsigned int)chan->_bridge, chan->uniqueid, chan->linkedid);
+       ast_log(LOG_NOTICE, "CHAN: masq: %p;  masqr: %p; _bridge: %p; uniqueID: %s; linkedID:%s\n",
+                       chan->masq, chan->masqr,
+                       chan->_bridge, chan->uniqueid, chan->linkedid);
        if (chan->masqr)
-               ast_log(LOG_NOTICE, "CHAN: masquerading as: %s;  cdr: %x;\n",
-                               chan->masqr->name, (unsigned int)chan->masqr->cdr);
+               ast_log(LOG_NOTICE, "CHAN: masquerading as: %s;  cdr: %p;\n",
+                               chan->masqr->name, chan->masqr->cdr);
        if (chan->_bridge)
                ast_log(LOG_NOTICE, "CHAN: Bridged to %s\n", chan->_bridge->name);