kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-07 22:03:50 +00:00
Code Issues Projects Releases Wiki Activity

passing non-null value to generate_xml_cdr now implies its an initalized xml object

Browse Source
This commit is contained in:
Anthony Minessale 2010-07-01 15:22:13 -05:00
parent 21edf395ca
commit 3a6bb506c0
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c
View File

@ -133,7 +133,7 @@ static rc_handle *my_radius_init(void)
static switch_status_t my_on_routing(switch_core_session_t *session) static switch_status_t my_on_routing(switch_core_session_t *session)
{ {
switch_xml_t cdr; switch_xml_t cdr = NULL;
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
rc_handle *rad_config; rc_handle *rad_config;
switch_status_t retval = SWITCH_STATUS_TERM; switch_status_t retval = SWITCH_STATUS_TERM;
@ -377,7 +377,7 @@ static switch_status_t my_on_routing(switch_core_session_t *session)
static switch_status_t my_on_reporting(switch_core_session_t *session) static switch_status_t my_on_reporting(switch_core_session_t *session)
{ {
switch_xml_t cdr; switch_xml_t cdr = NULL;
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
rc_handle *rad_config; rc_handle *rad_config;
switch_status_t retval = SWITCH_STATUS_TERM; switch_status_t retval = SWITCH_STATUS_TERM;

2
src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
View File

@ -2090,7 +2090,7 @@ static JSBool session_pre_answer(JSContext * cx, JSObject * obj, uintN argc, jsv
static JSBool session_cdr(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) static JSBool session_cdr(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval)
{ {
struct js_session *jss = JS_GetPrivate(cx, obj); struct js_session *jss = JS_GetPrivate(cx, obj);
switch_xml_t cdr; switch_xml_t cdr = NULL;
/*Always a pessimist... sheesh! */ /*Always a pessimist... sheesh! */
*rval = BOOLEAN_TO_JSVAL(JS_FALSE); *rval = BOOLEAN_TO_JSVAL(JS_FALSE);

2
src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
View File

@ -179,7 +179,7 @@ static switch_status_t set_xml_cdr_log_dirs()
static switch_status_t my_on_reporting(switch_core_session_t *session) static switch_status_t my_on_reporting(switch_core_session_t *session)
{ {
switch_xml_t cdr; switch_xml_t cdr = NULL;
char *xml_text = NULL; char *xml_text = NULL;
char *path = NULL; char *path = NULL;
char *curl_xml_text = NULL; char *curl_xml_text = NULL;

2
src/switch_cpp.cpp
View File

@ -542,7 +542,7 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::~CoreSession()
SWITCH_DECLARE(char *) CoreSession::getXMLCDR() SWITCH_DECLARE(char *) CoreSession::getXMLCDR()
{ {
switch_xml_t cdr; switch_xml_t cdr = NULL;
this_check((char *)""); this_check((char *)"");
sanity_check((char *)""); sanity_check((char *)"");

8
src/switch_ivr.c
View File

@ -1859,8 +1859,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_generate_xml_cdr(switch_core_session_
char tmp[512], *f; char tmp[512], *f;
int cdr_off = 0, v_off = 0, cd_off = 0; int cdr_off = 0, v_off = 0, cd_off = 0;
if (!(cdr = switch_xml_new("cdr"))) { if (*xml_cdr) {
return SWITCH_STATUS_SUCCESS; cdr = *xml_cdr;
} else {
if (!(cdr = switch_xml_new("cdr"))) {
return SWITCH_STATUS_SUCCESS;
}
} }
if (!(x_channel_data = switch_xml_add_child_d(cdr, "channel_data", cdr_off++))) { if (!(x_channel_data = switch_xml_add_child_d(cdr, "channel_data", cdr_off++))) {

2
src/switch_ivr_bridge.c
View File

@ -1211,7 +1211,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
} }
if (switch_channel_down(peer_channel) && switch_true(switch_channel_get_variable(peer_channel, SWITCH_COPY_XML_CDR_VARIABLE))) { if (switch_channel_down(peer_channel) && switch_true(switch_channel_get_variable(peer_channel, SWITCH_COPY_XML_CDR_VARIABLE))) {
switch_xml_t cdr; switch_xml_t cdr = NULL;
char *xml_text; char *xml_text;
switch_channel_wait_for_state(peer_channel, caller_channel, CS_DESTROY); switch_channel_wait_for_state(peer_channel, caller_channel, CS_DESTROY);