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.
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@3148 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip/src/pjsip/sip_auth_client.c b/pjsip/src/pjsip/sip_auth_client.c
index b158e74..e1667c9 100644
--- a/pjsip/src/pjsip/sip_auth_client.c
+++ b/pjsip/src/pjsip/sip_auth_client.c
@@ -87,25 +87,26 @@
int result;
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;
}
diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c
index b9700d8..59c7e93 100644
--- a/pjsip/src/pjsip/sip_transport_tls.c
+++ b/pjsip/src/pjsip/sip_transport_tls.c
@@ -1470,7 +1470,7 @@
if (state_cb) {
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 */
pj_bzero(&state_info, sizeof(state_info));