Changeset 4411

Timestamp:

Mar 4, 2013 4:34:38 AM (12 years ago)

Author:

nanang

Message:

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

Location:

pjproject/trunk

Files:

• pjlib/src/pj/lock.c (modified) (4 diffs)
• pjlib/src/pj/os_info.c (modified) (1 diff)
• pjmedia/src/pjmedia/types.c (modified) (1 diff)
• pjnath/src/pjnath/ice_strans.c (modified) (1 diff)
• pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp (modified) (1 diff)
• pjsip/src/pjsip/sip_endpoint.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/lock.c

@@ -352 +352 @@
     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);
@@ -448 +448 @@
 }
 
-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);
-
-    grp_lock_destroy(old);
+    pj_list_init(&old_lock->destroy_list);
+
+    grp_lock_destroy(old_lock);
     return PJ_SUCCESS;
 }
@@ -615 +615 @@
 {
     grp_lock_item *lck, *new_lck;
-    unsigned i;
+    int i;
 
     grp_lock_acquire(glock);
@@ -654 +654 @@
 
     if (lck != &glock->lock_list) {
-        unsigned i;
+        int i;
 
         pj_list_erase(lck);

pjproject/trunk/pjlib/src/pj/os_info.c

@@ -243 +243 @@
             si.os_name = pj_str("Unknown");
         }
+        
+        /* Avoid compile warning on Symbian. */
+        goto get_sdk_info;
     }
 #endif

pjproject/trunk/pjmedia/src/pjmedia/types.c

@@ -38 +38 @@
     };
 
-    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

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -1321 +1321 @@
     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);

pjproject/trunk/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp

@@ -35 +35 @@
 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};

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -870 +870 @@
 
     /* 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;
     }

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

@@ -617 +617 @@
     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);

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

@@ -2168 +2168 @@
             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,