From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 4 Jun 2010 16:04:23 +0000 (+0000)
Subject: Incorrect use of conditionnal expressions
X-Git-Tag: v3_5~983
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d6a933c9e75980d7fda5778d25fb0831b0f90b0b

Incorrect use of conditionnal expressions

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7825 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 80327379f6..2829fe5e58 100644
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -127,7 +127,7 @@ void *xbt_heap_pop(xbt_heap_t H)
       (void *) realloc(H->items, (H->size) * sizeof(struct xbt_heapItem));
   }
 
-  H->update_callback ? H->update_callback(max, -1) : NULL;
+  if(H->update_callback) H->update_callback(max, -1);
   return max;
 }
 
@@ -198,10 +198,10 @@ static void xbt_heap_maxHeapify(xbt_heap_t H)
       struct xbt_heapItem tmp = H->items[i];
       H->items[i] = H->items[greatest];
       H->items[greatest] = tmp;
-      H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL;
+      if(H->update_callback) H->update_callback(CONTENT(H, i), i);
       i = greatest;
     } else {
-      H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL;
+      if(H->update_callback) H->update_callback(CONTENT(H, i), i);
       return;
     }
   }
@@ -220,10 +220,10 @@ static void xbt_heap_increaseKey(xbt_heap_t H, int i)
     struct xbt_heapItem tmp = H->items[i];
     H->items[i] = H->items[PARENT(i)];
     H->items[PARENT(i)] = tmp;
-    H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL;
+    if(H->update_callback) H->update_callback(CONTENT(H, i), i);
     i = PARENT(i);
   }
-  H->update_callback ? H->update_callback(CONTENT(H, i), i) : NULL;
+  if(H->update_callback) H->update_callback(CONTENT(H, i), i);
   return;
 }