Author: mikej Date: Sun May 25 09:53:04 2008 New Revision: 8609 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Tue May 20 07:51:51 EDT 2008 Pekka.Pessi@nokia.com * nua_session.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:53:04 2008 @@ -1 +1 @@ -Sun May 25 09:52:17 EDT 2008 +Sun May 25 09:52:56 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Sun May 25 09:53:04 2008 @@ -223,7 +223,7 @@ nua_dialog_state_t *ds, nua_dialog_usage_t *du) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); if (ds->ds_has_session) return -1; @@ -243,7 +243,7 @@ nua_client_request_t *cr0, nua_server_request_t *sr0) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); nua_client_request_t *cr, *cr_next; nua_server_request_t *sr; @@ -1478,7 +1478,7 @@ nua_dialog_usage_t *du, sip_time_t now) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); nua_client_request_t const *cr = du->du_cr; nua_server_request_t const *sr; @@ -1525,7 +1525,7 @@ nua_dialog_state_t *ds, nua_dialog_usage_t *du) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); nua_server_request_t *sr, *sr_next; nua_client_request_t *cri; @@ -2729,7 +2729,7 @@ if (nh->nh_soa == NULL) { if (sr->sr_offer_recv && session_get_description(sip, NULL, NULL)) - sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer; + sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer; } else if ((sr->sr_offer_recv && soa_generate_answer(nh->nh_soa, NULL) < 0) || (sr->sr_answer_recv && soa_process_answer(nh->nh_soa, NULL) < 0)) { @@ -2743,7 +2743,7 @@ if (session_include_description(nh->nh_soa, 1, msg, sip) < 0) sr_status(sr, SIP_500_INTERNAL_SERVER_ERROR); else - sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer; + sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer; } } @@ -3398,7 +3398,7 @@ } sr->sr_offer_recv = 1; - ss->ss_oa_recv = Offer; + ss ? ss->ss_oa_recv = Offer : Offer; } return 0; @@ -3416,7 +3416,7 @@ if (200 <= sr->sr_status && sr->sr_status < 300 && sr->sr_sdp) { if (nh->nh_soa == NULL) { - sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer; + sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer; } else if (soa_generate_answer(nh->nh_soa, NULL) < 0) { SU_DEBUG_5(("nua(%p): %s server: %s %s\n",