diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2013-03-04 04:34:38 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2013-03-04 04:34:38 +0000 |
commit | 9df2311a5f5f9211f24ad03e13c161ec5d6429bf (patch) | |
tree | 023ff56f7de98ae93d9ad94a76ac06de34b7ccdf | |
parent | a3bbd2d78cfde6c165335dd073ccbad952d6bdd7 (diff) |
Misc (re #1559): fixed compile errors/warnings on Symbian platform.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4411 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r-- | pjlib/src/pj/lock.c | 22 | ||||
-rw-r--r-- | pjlib/src/pj/os_info.c | 3 | ||||
-rw-r--r-- | pjmedia/src/pjmedia/types.c | 4 | ||||
-rw-r--r-- | pjnath/src/pjnath/ice_strans.c | 1 | ||||
-rw-r--r-- | pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp | 1 | ||||
-rw-r--r-- | pjsip/src/pjsip/sip_endpoint.c | 2 | ||||
-rw-r--r-- | pjsip/src/pjsip/sip_transport_tls.c | 7 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_call.c | 2 |
8 files changed, 22 insertions, 20 deletions
diff --git a/pjlib/src/pj/lock.c b/pjlib/src/pj/lock.c index 04b1b670..a9e60594 100644 --- a/pjlib/src/pj/lock.c +++ b/pjlib/src/pj/lock.c @@ -351,7 +351,7 @@ static pj_status_t grp_lock_destroy(LOCK_OBJ *p) lck = glock->lock_list.next; while (lck != &glock->lock_list) { if (lck->lock != glock->own_lock) { - unsigned i; + int i; for (i=0; i<glock->owner_cnt; ++i) pj_lock_release(lck->lock); } @@ -447,27 +447,27 @@ PJ_DEF(pj_status_t) pj_grp_lock_release( pj_grp_lock_t *grp_lock) return grp_lock_release(grp_lock); } -PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old, - pj_grp_lock_t *new) +PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old_lock, + pj_grp_lock_t *new_lock) { grp_destroy_callback *ocb; /* Move handlers from old to new */ - ocb = old->destroy_list.next; - while (ocb != &old->destroy_list) { + ocb = old_lock->destroy_list.next; + while (ocb != &old_lock->destroy_list) { grp_destroy_callback *ncb; - ncb = PJ_POOL_ALLOC_T(new->pool, grp_destroy_callback); + ncb = PJ_POOL_ALLOC_T(new_lock->pool, grp_destroy_callback); ncb->comp = ocb->comp; ncb->handler = ocb->handler; - pj_list_push_back(&new->destroy_list, ncb); + pj_list_push_back(&new_lock->destroy_list, ncb); ocb = ocb->next; } - pj_list_init(&old->destroy_list); + pj_list_init(&old_lock->destroy_list); - grp_lock_destroy(old); + grp_lock_destroy(old_lock); return PJ_SUCCESS; } @@ -614,7 +614,7 @@ PJ_DEF(pj_status_t) pj_grp_lock_chain_lock( pj_grp_lock_t *glock, int pos) { grp_lock_item *lck, *new_lck; - unsigned i; + int i; grp_lock_acquire(glock); @@ -653,7 +653,7 @@ PJ_DEF(pj_status_t) pj_grp_lock_unchain_lock( pj_grp_lock_t *glock, } if (lck != &glock->lock_list) { - unsigned i; + int i; pj_list_erase(lck); for (i=0; i<glock->owner_cnt; ++i) diff --git a/pjlib/src/pj/os_info.c b/pjlib/src/pj/os_info.c index fe284add..f7136c11 100644 --- a/pjlib/src/pj/os_info.c +++ b/pjlib/src/pj/os_info.c @@ -242,6 +242,9 @@ PJ_DEF(const pj_sys_info*) pj_get_sys_info(void) } else { si.os_name = pj_str("Unknown"); } + + /* Avoid compile warning on Symbian. */ + goto get_sdk_info; } #endif diff --git a/pjmedia/src/pjmedia/types.c b/pjmedia/src/pjmedia/types.c index 38c0d050..0dd8c8a9 100644 --- a/pjmedia/src/pjmedia/types.c +++ b/pjmedia/src/pjmedia/types.c @@ -37,10 +37,10 @@ PJ_DEF(const char*) pjmedia_type_name(pjmedia_type t) "unknown" }; - pj_assert(t < PJ_ARRAY_SIZE(type_names)); + pj_assert(t < (int)PJ_ARRAY_SIZE(type_names)); pj_assert(PJMEDIA_TYPE_UNKNOWN == 4); - if (t < PJ_ARRAY_SIZE(type_names)) + if (t < (int)PJ_ARRAY_SIZE(type_names)) return type_names[t]; else return "??"; diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c index 8324e532..e9b1dfba 100644 --- a/pjnath/src/pjnath/ice_strans.c +++ b/pjnath/src/pjnath/ice_strans.c @@ -1320,7 +1320,6 @@ static pj_status_t ice_tx_pkt(pj_ice_sess *ice, pj_ice_strans *ice_st = (pj_ice_strans*)ice->user_data; pj_ice_strans_comp *comp; pj_status_t status; - char daddr[PJ_INET6_ADDRSTRLEN]; PJ_ASSERT_RETURN(comp_id && comp_id <= ice_st->comp_cnt, PJ_EINVAL); diff --git a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp index 79e81f28..a0a5431e 100644 --- a/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp +++ b/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp @@ -34,7 +34,6 @@ static RConnection aConn; static pjsua_acc_id g_acc_id = PJSUA_INVALID_ID;
static pjsua_call_id g_call_id = PJSUA_INVALID_ID;
-static pjsua_buddy_id g_buddy_id = PJSUA_INVALID_ID;
static symbian_ua_info_cb_t g_cb = {NULL, NULL, NULL, NULL, NULL};
diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c index b54e83e9..3ecf2099 100644 --- a/pjsip/src/pjsip/sip_endpoint.c +++ b/pjsip/src/pjsip/sip_endpoint.c @@ -869,7 +869,7 @@ PJ_DEF(pj_status_t) pjsip_endpt_process_rx_data( pjsip_endpoint *endpt, } /* Start with the specified priority */ - while (mod != &endpt->module_list && mod->priority < p->start_prio) { + while (mod != &endpt->module_list && mod->priority < (int)p->start_prio) { mod = mod->next; } diff --git a/pjsip/src/pjsip/sip_transport_tls.c b/pjsip/src/pjsip/sip_transport_tls.c index 543bb1cf..1f7c0dee 100644 --- a/pjsip/src/pjsip/sip_transport_tls.c +++ b/pjsip/src/pjsip/sip_transport_tls.c @@ -616,9 +616,10 @@ static pj_status_t tls_create( struct tls_listener *listener, tls->base.key.type = listener->factory.type; pj_sockaddr_cp(&tls->base.key.rem_addr, remote); - tls->base.type_name = (char*) - pjsip_transport_get_type_name(tls->base.key.type); - tls->base.flag = pjsip_transport_get_flag_from_type(tls->base.key.type); + tls->base.type_name = (char*)pjsip_transport_get_type_name( + (pjsip_transport_type_e)tls->base.key.type); + tls->base.flag = pjsip_transport_get_flag_from_type( + (pjsip_transport_type_e)tls->base.key.type); tls->base.info = (char*) pj_pool_alloc(pool, 64); pj_ansi_snprintf(tls->base.info, 64, "%s to %s", diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c index f42ccf09..6db50cd8 100644 --- a/pjsip/src/pjsua-lib/pjsua_call.c +++ b/pjsip/src/pjsua-lib/pjsua_call.c @@ -2167,7 +2167,7 @@ PJ_DEF(pj_status_t) pjsua_call_hangup(pjsua_call_id call_id, if (code == 0) call->last_code = PJSIP_SC_REQUEST_TERMINATED; else - call->last_code = code; + call->last_code = (pjsip_status_code)code; if (reason) { pj_strncpy(&call->last_text, reason, sizeof(call->last_text_buf_)); |