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

Timestamp:

Jan 21, 2007 5:53:39 PM (17 years ago)

Author:

bennylp

Message:

Fixed gcc warnings, especially about dereferencing type-punned pointer

File:

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

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

@@ -60 +60 @@
 {
     pj_lock_t *p_lock;
+    pj_mutex_t *mutex;
     pj_status_t rc;
 
@@ -69 +70 @@
 
     pj_memcpy(p_lock, &mutex_lock_template, sizeof(pj_lock_t));
-    rc = pj_mutex_create(pool, name, type, (pj_mutex_t**)&p_lock->lock_object);
+    rc = pj_mutex_create(pool, name, type, &mutex);
     if (rc != PJ_SUCCESS)
         return rc;
 
+    p_lock->lock_object = mutex;
     *lock = p_lock;
     return PJ_SUCCESS;
@@ -146 +148 @@
 {
     pj_lock_t *p_lock;
+    pj_sem_t *sem;
     pj_status_t rc;
 
@@ -155 +158 @@
 
     pj_memcpy(p_lock, &sem_lock_template, sizeof(pj_lock_t));
-    rc = pj_sem_create( pool, name, initial, max, 
-                        (pj_sem_t**)&p_lock->lock_object);
+    rc = pj_sem_create( pool, name, initial, max, &sem);
     if (rc != PJ_SUCCESS)
         return rc;
 
+    p_lock->lock_object = sem;
     *lock = p_lock;