passing non-null value to generate_xml_cdr now implies its an initalized xml object
This commit is contained in:
parent
21edf395ca
commit
3a6bb506c0
|
@ -133,7 +133,7 @@ static rc_handle *my_radius_init(void)
|
|||
|
||||
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);
|
||||
rc_handle *rad_config;
|
||||
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)
|
||||
{
|
||||
switch_xml_t cdr;
|
||||
switch_xml_t cdr = NULL;
|
||||
switch_channel_t *channel = switch_core_session_get_channel(session);
|
||||
rc_handle *rad_config;
|
||||
switch_status_t retval = SWITCH_STATUS_TERM;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
struct js_session *jss = JS_GetPrivate(cx, obj);
|
||||
switch_xml_t cdr;
|
||||
switch_xml_t cdr = NULL;
|
||||
|
||||
/*Always a pessimist... sheesh! */
|
||||
*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
switch_xml_t cdr;
|
||||
switch_xml_t cdr = NULL;
|
||||
char *xml_text = NULL;
|
||||
char *path = NULL;
|
||||
char *curl_xml_text = NULL;
|
||||
|
|
|
@ -542,7 +542,7 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::~CoreSession()
|
|||
SWITCH_DECLARE(char *) CoreSession::getXMLCDR()
|
||||
{
|
||||
|
||||
switch_xml_t cdr;
|
||||
switch_xml_t cdr = NULL;
|
||||
|
||||
this_check((char *)"");
|
||||
sanity_check((char *)"");
|
||||
|
|
|
@ -1859,8 +1859,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_generate_xml_cdr(switch_core_session_
|
|||
char tmp[512], *f;
|
||||
int cdr_off = 0, v_off = 0, cd_off = 0;
|
||||
|
||||
if (!(cdr = switch_xml_new("cdr"))) {
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
if (*xml_cdr) {
|
||||
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++))) {
|
||||
|
|
|
@ -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))) {
|
||||
switch_xml_t cdr;
|
||||
switch_xml_t cdr = NULL;
|
||||
char *xml_text;
|
||||
|
||||
switch_channel_wait_for_state(peer_channel, caller_channel, CS_DESTROY);
|
||||
|
|
Loading…
Reference in New Issue