Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / examples / gras / properties / properties.c

diff --git a/examples/gras/properties/properties.c b/examples/gras/properties/properties.c
index 8f93be0..9921498 100644 (file)
--- a/examples/gras/properties/properties.c
+++ b/examples/gras/properties/properties.c
@@ -21,7 +21,7 @@ int alice(int argc, char *argv[])
 
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;
-  const char *value;
+  _XBT_GNUC_UNUSED const char *value;
 
   /* Let the other process change the host props */
   gras_os_sleep(1);
@@ -37,18 +37,17 @@ int alice(int argc, char *argv[])
 
   XBT_INFO("== Try to get a process property that does not exist");
   value = gras_process_property_value("Nonexisting");
-  xbt_assert0(!value, "nonexisting property exists!!");
+  xbt_assert(!value, "nonexisting property exists!!");
 
   /* Modify an existing property. First check it exists */
   XBT_INFO("== Trying to modify a process property");
   value = gras_process_property_value("new prop");
-  xbt_assert0(!value, "Property 'new prop' exists before I add it!");
-  xbt_dict_set(process_props, "new prop", xbt_strdup("new value"),
-               xbt_free_f);
+  xbt_assert(!value, "Property 'new prop' exists before I add it!");
+  xbt_dict_set(process_props, "new prop", xbt_strdup("new value"), NULL);
 
   /* Test if we have changed the value */
   value = gras_process_property_value("new prop");
-  xbt_assert1(!strcmp(value, "new value"),
+  xbt_assert(!strcmp(value, "new value"),
               "New property does have the value I've set ('%s' != 'new value')",
               value);
 
@@ -64,7 +63,7 @@ int bob(int argc, char *argv[])
   xbt_dict_t host_props = gras_os_host_properties();
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;
-  const char *value;
+  _XBT_GNUC_UNUSED const char *value;
 
   XBT_INFO("== Dump all the properties of host1");
   xbt_dict_foreach(host_props, cursor, key, data)
@@ -72,13 +71,13 @@ int bob(int argc, char *argv[])
 
   XBT_INFO("== Try to get a property that does not exist");
   value = gras_os_host_property_value("non existing key");
-  xbt_assert1(value == NULL,
+  xbt_assert(value == NULL,
               "The key 'non existing key' exists (with value '%s')!!",
               value);
 
   XBT_INFO
       ("== Set a host property that alice will try to retrieve in SG (from bob->hello)");
-  xbt_dict_set(host_props, "from bob", xbt_strdup("hello"), xbt_free_f);
+  xbt_dict_set(host_props, "from bob", xbt_strdup("hello"), NULL);
 
   XBT_INFO("== Dump all the properties of host1 again to check the addition");
   xbt_dict_foreach(host_props, cursor, key, data)