Changeset 4411 for pjproject/trunk/pjlib/src/pj/lock.c

Timestamp:

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

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjlib/src/pj/lock.c (modified) (4 diffs)

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);