Merge branch 'master' into MC_LTL

[simgrid.git] / examples / msg / properties / msg_prop.c

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index fcf9519..5b36d02 100644 (file)
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -38,24 +38,24 @@ int alice(int argc, char *argv[])
 
   XBT_INFO("== Try to get a host property that does not exist");
   value = MSG_host_get_property_value(host1, noexist);
-  xbt_assert0(!value, "The key exists (it's not supposed to)");
+  xbt_assert(!value, "The key exists (it's not supposed to)");
 
   XBT_INFO("== Try to get a host property that does exist");
   value = MSG_host_get_property_value(host1, exist);
-  xbt_assert1(value, "\tProperty %s is undefined (where it should)",
+  xbt_assert(value, "\tProperty %s is undefined (where it should)",
               exist);
-  xbt_assert2(!strcmp(value, "180"),
+  xbt_assert(!strcmp(value, "180"),
               "\tValue of property %s is defined to %s (where it should be 180)",
               exist, value);
   XBT_INFO("   Property: %s old value: %s", exist, value);
 
   XBT_INFO("== Trying to modify a host property");
-  xbt_dict_set(props, exist, xbt_strdup("250"), xbt_free_f);
+  xbt_dict_set(props, exist, xbt_strdup("250"), NULL);
 
   /* Test if we have changed the value */
   value = MSG_host_get_property_value(host1, exist);
-  xbt_assert1(value, "Property %s is undefined (where it should)", exist);
-  xbt_assert2(!strcmp(value, "250"),
+  xbt_assert(value, "Property %s is undefined (where it should)", exist);
+  xbt_assert(!strcmp(value, "250"),
               "Value of property %s is defined to %s (where it should be 250)",
               exist, value);
   XBT_INFO("   Property: %s old value: %s", exist, value);
@@ -70,7 +70,7 @@ int bob(int argc, char *argv[])
   xbt_dict_cursor_t cursor = NULL;
   char *key, *data;
   const char *noexist = "UnknownProcessProp";
-  const char *value;
+  _XBT_GNUC_UNUSED const char *value;
 
   XBT_INFO("== Print the properties of the process");
   xbt_dict_foreach(props, cursor, key, data)
@@ -79,7 +79,7 @@ int bob(int argc, char *argv[])
   XBT_INFO("== Try to get a process property that does not exist");
 
   value = MSG_process_get_property_value(MSG_process_self(), noexist);
-  xbt_assert0(!value, "The property is defined (it shouldnt)");
+  xbt_assert(!value, "The property is defined (it shouldnt)");
 
   return 0;
 }