Changeset 3148 for pjproject

Timestamp:

Apr 28, 2010 7:52:57 AM (15 years ago)

Author:

nanang

Message:

Misc (#1026) fixed build problems on Symbian S60 5th edition:

• link error undefined reference to `.L23' in function pjsip_cred_info_cmp() (thanks Ken Fish for the report).
• compile error unable to convert pj_uint32_t to pjsip_transport_state.

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_auth_client.c (modified) (1 diff)
• sip_transport_tls.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -88 +88 @@
 
     result = pj_strcmp(&cred1->realm, &cred2->realm);
-    if (result) return result;
+    if (result) goto on_return;
     result = pj_strcmp(&cred1->scheme, &cred2->scheme);
-    if (result) return result;
+    if (result) goto on_return;
     result = pj_strcmp(&cred1->username, &cred2->username);
-    if (result) return result;
+    if (result) goto on_return;
     result = pj_strcmp(&cred1->data, &cred2->data);
-    if (result) return result;
-    if (cred1->data_type != cred2->data_type)
-        return -1;
+    if (result) goto on_return;
+    result = (cred1->data_type != cred2->data_type);
+    if (result) goto on_return;
 
     if ((cred1->data_type & EXT_MASK) == PJSIP_CRED_DATA_EXT_AKA) {
         result = pj_strcmp(&cred1->ext.aka.k, &cred2->ext.aka.k);
-        if (result) return result;
+        if (result) goto on_return;
         result = pj_strcmp(&cred1->ext.aka.op, &cred2->ext.aka.op);
-        if (result) return result;
+        if (result) goto on_return;
         result = pj_strcmp(&cred1->ext.aka.amf, &cred2->ext.aka.amf);
-        if (result) return result;
-    }
-
+        if (result) goto on_return;
+    }
+
+on_return:
     return result;
 }

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -1471 +1471 @@
         pjsip_transport_state_info state_info;
         pjsip_tls_state_info tls_info;
-        pj_uint32_t tp_state = 0;
+        pjsip_transport_state tp_state;
 
         /* Init transport state info */