From: agiersch <agiersch@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 1 Dec 2010 22:01:05 +0000 (+0000)
Subject: Fix, simplify, and reindent surf_*_resource_cmp functions.
X-Git-Tag: v3.6_beta2~1060
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c2c2599d6e7601cb5134fbab4ce90925138482ae

Fix, simplify, and reindent surf_*_resource_cmp functions.

Use !! construct to return 1 for true.

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index bf7d22c6b5..e16cdfcede 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -2774,16 +2774,14 @@ static void generic_set_autonomous_system(routing_component_t rc,
   xbt_dict_set(_to_index, name, id, xbt_free);
 }
 
-static int surf_pointer_resource_cmp(const void *a, const void *b) {
-	if(a == b)
-		return 0;
-	return 1;
+static int surf_pointer_resource_cmp(const void *a, const void *b)
+{
+  return a != b;
 }
 
-static int surf_link_resource_cmp(const void *a, const void *b) {
-	if( memcmp(a,b,global_routing->size_of_link) == 0 );
-		return 0;
-	return 1;
+static int surf_link_resource_cmp(const void *a, const void *b)
+{
+  return !!memcmp(a,b,global_routing->size_of_link);
 }
 
 static void generic_set_bypassroute(routing_component_t rc,