Changeset 3921 for pjproject/trunk

Timestamp:

Dec 26, 2011 9:00:42 AM (13 years ago)

Author:

bennylp

Message:

Re #1393 (misc): renamed label on_error to on_return and fixed warning re constness

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (8 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1344 +1344 @@
 
     if (status != PJ_SUCCESS)
-        goto on_error;
+        goto on_return;
 
     if (call_med->tp_st == PJSUA_MED_TP_CREATING)
@@ -1369 +1369 @@
                 err_code = PJSIP_SC_NOT_ACCEPTABLE;
                 status = PJSIP_ESESSIONINSECURE;
-                goto on_error;
+                goto on_return;
             }
         }
@@ -1389 +1389 @@
         if (status != PJ_SUCCESS) {
             err_code = PJSIP_SC_INTERNAL_SERVER_ERROR;
-            goto on_error;
+            goto on_return;
         }
 
@@ -1408 +1408 @@
 
 
-on_error:
+on_return:
     if (status != PJ_SUCCESS && call_med->tp) {
         pjmedia_transport_close(call_med->tp);
@@ -1558 +1558 @@
     if (status != PJ_SUCCESS) {
         pjsua_media_channel_deinit(call_id);
-        goto on_error;
+        goto on_return;
     }
 
@@ -1599 +1599 @@
                 call->med_ch_info.sip_err_code = PJSIP_SC_NOT_ACCEPTABLE;
                 pjsua_media_channel_deinit(call_id);
-                goto on_error;
+                goto on_return;
             }
 
@@ -1608 +1608 @@
     call->med_ch_info.status = PJ_SUCCESS;
 
-on_error:
+on_return:
     if (call->med_ch_cb)
         (*call->med_ch_cb)(call->index, &call->med_ch_info);
@@ -1716 +1716 @@
          */
         if (reinit) {
-            pjmedia_sdp_session *sdp;
+            const pjmedia_sdp_session *sdp;
 
             status = pjmedia_sdp_neg_get_active_local(call->inv->neg, &sdp);