Changeset 4411


Ignore:
Timestamp:
Mar 4, 2013 4:34:38 AM (8 years ago)
Author:
nanang
Message:

Misc (re #1559): fixed compile errors/warnings on Symbian platform.

Location:
pjproject/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pj/lock.c

    r4359 r4411  
    352352    while (lck != &glock->lock_list) { 
    353353        if (lck->lock != glock->own_lock) { 
    354             unsigned i; 
     354            int i; 
    355355            for (i=0; i<glock->owner_cnt; ++i) 
    356356                pj_lock_release(lck->lock); 
     
    448448} 
    449449 
    450 PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old, 
    451                                          pj_grp_lock_t *new) 
     450PJ_DEF(pj_status_t) pj_grp_lock_replace( pj_grp_lock_t *old_lock, 
     451                                         pj_grp_lock_t *new_lock) 
    452452{ 
    453453    grp_destroy_callback *ocb; 
    454454 
    455455    /* Move handlers from old to new */ 
    456     ocb = old->destroy_list.next; 
    457     while (ocb != &old->destroy_list) { 
     456    ocb = old_lock->destroy_list.next; 
     457    while (ocb != &old_lock->destroy_list) { 
    458458        grp_destroy_callback *ncb; 
    459459 
    460         ncb = PJ_POOL_ALLOC_T(new->pool, grp_destroy_callback); 
     460        ncb = PJ_POOL_ALLOC_T(new_lock->pool, grp_destroy_callback); 
    461461        ncb->comp = ocb->comp; 
    462462        ncb->handler = ocb->handler; 
    463         pj_list_push_back(&new->destroy_list, ncb); 
     463        pj_list_push_back(&new_lock->destroy_list, ncb); 
    464464 
    465465        ocb = ocb->next; 
    466466    } 
    467467 
    468     pj_list_init(&old->destroy_list); 
    469  
    470     grp_lock_destroy(old); 
     468    pj_list_init(&old_lock->destroy_list); 
     469 
     470    grp_lock_destroy(old_lock); 
    471471    return PJ_SUCCESS; 
    472472} 
     
    615615{ 
    616616    grp_lock_item *lck, *new_lck; 
    617     unsigned i; 
     617    int i; 
    618618 
    619619    grp_lock_acquire(glock); 
     
    654654 
    655655    if (lck != &glock->lock_list) { 
    656         unsigned i; 
     656        int i; 
    657657 
    658658        pj_list_erase(lck); 
  • pjproject/trunk/pjlib/src/pj/os_info.c

    r3553 r4411  
    243243            si.os_name = pj_str("Unknown"); 
    244244        } 
     245         
     246        /* Avoid compile warning on Symbian. */ 
     247        goto get_sdk_info; 
    245248    } 
    246249#endif 
  • pjproject/trunk/pjmedia/src/pjmedia/types.c

    r3715 r4411  
    3838    }; 
    3939 
    40     pj_assert(t < PJ_ARRAY_SIZE(type_names)); 
     40    pj_assert(t < (int)PJ_ARRAY_SIZE(type_names)); 
    4141    pj_assert(PJMEDIA_TYPE_UNKNOWN == 4); 
    4242 
    43     if (t < PJ_ARRAY_SIZE(type_names)) 
     43    if (t < (int)PJ_ARRAY_SIZE(type_names)) 
    4444        return type_names[t]; 
    4545    else 
  • pjproject/trunk/pjnath/src/pjnath/ice_strans.c

    r4365 r4411  
    13211321    pj_ice_strans_comp *comp; 
    13221322    pj_status_t status; 
    1323     char daddr[PJ_INET6_ADDRSTRLEN]; 
    13241323 
    13251324    PJ_ASSERT_RETURN(comp_id && comp_id <= ice_st->comp_cnt, PJ_EINVAL); 
  • pjproject/trunk/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp

    r3553 r4411  
    3535static pjsua_acc_id g_acc_id = PJSUA_INVALID_ID; 
    3636static pjsua_call_id g_call_id = PJSUA_INVALID_ID; 
    37 static pjsua_buddy_id g_buddy_id = PJSUA_INVALID_ID; 
    3837 
    3938static symbian_ua_info_cb_t g_cb =  {NULL, NULL, NULL, NULL, NULL}; 
  • pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

    r4291 r4411  
    870870 
    871871    /* Start with the specified priority */ 
    872     while (mod != &endpt->module_list && mod->priority < p->start_prio) { 
     872    while (mod != &endpt->module_list && mod->priority < (int)p->start_prio) { 
    873873        mod = mod->next; 
    874874    } 
  • pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

    r4281 r4411  
    617617    tls->base.key.type = listener->factory.type; 
    618618    pj_sockaddr_cp(&tls->base.key.rem_addr, remote); 
    619     tls->base.type_name = (char*) 
    620                           pjsip_transport_get_type_name(tls->base.key.type); 
    621     tls->base.flag = pjsip_transport_get_flag_from_type(tls->base.key.type); 
     619    tls->base.type_name = (char*)pjsip_transport_get_type_name( 
     620                                   (pjsip_transport_type_e)tls->base.key.type); 
     621    tls->base.flag = pjsip_transport_get_flag_from_type( 
     622                                   (pjsip_transport_type_e)tls->base.key.type); 
    622623 
    623624    tls->base.info = (char*) pj_pool_alloc(pool, 64); 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

    r4371 r4411  
    21682168            call->last_code = PJSIP_SC_REQUEST_TERMINATED; 
    21692169        else 
    2170             call->last_code = code; 
     2170            call->last_code = (pjsip_status_code)code; 
    21712171        if (reason) { 
    21722172            pj_strncpy(&call->last_text, reason, 
Note: See TracChangeset for help on using the changeset viewer.