Changeset 6067 for pjproject

Timestamp:

Sep 9, 2019 8:41:53 AM (5 years ago)

Author:

nanang

Message:

Re #2225: Fixed compile errors in timer on MSVC2005.

File:

• pjproject/trunk/pjlib/src/pj/timer.c (modified) (5 diffs)

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

@@ -301 +301 @@
         GET_ENTRY(removed_node)->_timer_id)
     {
-            PJ_LOG(3,(THIS_FILE, "Bug! Trying to remove entry %p from %s "
-                                 "line %d, which has been deallocated "
-                                 "without being cancelled",
-                                 GET_ENTRY(removed_node),
 #if PJ_TIMER_DEBUG
-                                 removed_node->src_file,
-                                 removed_node->src_line));
+        PJ_LOG(3,(THIS_FILE, "Bug! Trying to remove entry %p from %s "
+                             "line %d, which has been deallocated "
+                             "without being cancelled",
+                             GET_ENTRY(removed_node),
+                             removed_node->src_file,
+                             removed_node->src_line));
 #else
-                                 "N/A", 0));
+        PJ_LOG(3,(THIS_FILE, "Bug! Trying to remove entry %p "
+                             "which has been deallocated "
+                             "without being cancelled",
+                             GET_ENTRY(removed_node)));
 #endif
 #if ASSERT_IF_ENTRY_DESTROYED
@@ -352 +355 @@
     pj_timer_id_t *new_timer_ids;
     pj_size_t i;
+    pj_timer_entry_dup **new_heap = 0;
     
     PJ_LOG(6,(THIS_FILE, "Growing heap size from %d to %d",
@@ -357 +361 @@
     
     // First grow the heap itself.
-    
-    pj_timer_entry_dup **new_heap = 0;
-    
     new_heap = (pj_timer_entry_dup**) 
                pj_pool_calloc(ht->pool, new_size, sizeof(pj_timer_entry_dup*));
@@ -379 +380 @@
         int idx = ht->heap[i] - ht->timer_dups;
         // Point to the address in the new array
-        pj_assert(idx >= 0 && idx < ht->max_size);
+        pj_assert(idx >= 0 && idx < (int)ht->max_size);
         new_heap[i] = &new_timer_dups[idx];
     }
@@ -805 +806 @@
         {
             valid = PJ_FALSE;
+#if PJ_TIMER_DEBUG
             PJ_LOG(3,(THIS_FILE, "Bug! Polling entry %p from %s line %d has "
                                  "been deallocated without being cancelled",
                                  GET_ENTRY(node),
-#if PJ_TIMER_DEBUG
                                  node->src_file, node->src_line));
 #else
-                                 "N/A", 0));
+            PJ_LOG(3,(THIS_FILE, "Bug! Polling entry %p has "
+                                 "been deallocated without being cancelled",
+                                 GET_ENTRY(node)));
 #endif
 #if ASSERT_IF_ENTRY_DESTROYED