From: Christophe Thiéry <christopho128@gmail.com>
Date: Mon, 7 Nov 2011 09:50:42 +0000 (+0100)
Subject: Add some _XBT_GNUC_UNUSED to avoid compilation warnings with NDEBUG
X-Git-Tag: exp_20120216~466
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7da44b26eb7f4da0d4ce7672f479dea4d01767b3

Add some _XBT_GNUC_UNUSED to avoid compilation warnings with NDEBUG
---

diff --git a/examples/gras/mmrpc/mmrpc_client.c b/examples/gras/mmrpc/mmrpc_client.c
index e732804d0a..a4fb89f5ef 100644
--- a/examples/gras/mmrpc/mmrpc_client.c
+++ b/examples/gras/mmrpc/mmrpc_client.c
@@ -34,7 +34,8 @@ int client(int argc, char *argv[])
   gras_socket_t from;
   xbt_matrix_t request[2], answer;
 
-  int i, j;
+  int i;
+  _XBT_GNUC_UNUSED int j;
 
   const char *host = "127.0.0.1";
   int port = 4000;
diff --git a/examples/gras/properties/properties.c b/examples/gras/properties/properties.c
index 358df121c5..b0ae355e49 100644
--- 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);
@@ -64,7 +64,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)
diff --git a/examples/msg/icomms/peer.c b/examples/msg/icomms/peer.c
index 17f10609a8..dff859edd0 100644
--- a/examples/msg/icomms/peer.c
+++ b/examples/msg/icomms/peer.c
@@ -86,7 +86,7 @@ int sender(int argc, char *argv[])
 int receiver(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  MSG_error_t res;
+  _XBT_GNUC_UNUSED MSG_error_t res;
   int id = -1;
   char mailbox[80];
   msg_comm_t res_irecv;
@@ -95,7 +95,7 @@ int receiver(int argc, char *argv[])
   XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time,
         sleep_test_time);
 
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[1], "%d", &id);
   xbt_assert(read,
               "Invalid argument %s\n", argv[1]);
diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c
index d068417d7c..fde2c5a4c8 100644
--- a/examples/msg/icomms/peer2.c
+++ b/examples/msg/icomms/peer2.c
@@ -62,11 +62,11 @@ int sender(int argc, char *argv[])
 int receiver(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  MSG_error_t res;
+  _XBT_GNUC_UNUSED MSG_error_t res;
   int id = -1;
   char mailbox[80];
   msg_comm_t res_irecv;
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[1], "%d", &id);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
   MSG_process_sleep(10);
diff --git a/examples/msg/icomms/peer3.c b/examples/msg/icomms/peer3.c
index c9d126b696..410e0f721e 100644
--- a/examples/msg/icomms/peer3.c
+++ b/examples/msg/icomms/peer3.c
@@ -64,7 +64,7 @@ int sender(int argc, char *argv[])
   sprintf(mailbox, "finalize");
 
   msg_comm_t res_irecv;
-  MSG_error_t res_wait;
+  _XBT_GNUC_UNUSED MSG_error_t res_wait;
   for (i = 0; i < receivers_count; i++) {
     task = NULL;
     res_irecv = MSG_task_irecv(&(task), mailbox);
@@ -88,7 +88,7 @@ int receiver(int argc, char *argv[])
   int tasks = atof(argv[2]);
   m_task_t *task = xbt_new(m_task_t, tasks);
 
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[1], "%d", &id);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
   sprintf(mailbox, "receiver-%d", id);
@@ -104,7 +104,7 @@ int receiver(int argc, char *argv[])
   /* Here we are waiting for the receiving of all communications */
   m_task_t task_com;
   while (!xbt_dynar_is_empty(comms)) {
-    MSG_error_t err;
+    _XBT_GNUC_UNUSED MSG_error_t err;
     xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
     task_com = MSG_comm_get_task(res_irecv);
     MSG_comm_destroy(res_irecv);
diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index 159a1bf82b..b35ebe692f 100644
--- a/examples/msg/masterslave/masterslave_bypass.c
+++ b/examples/msg/masterslave/masterslave_bypass.c
@@ -167,7 +167,7 @@ int master(int argc, char *argv[])
   double task_comp_size = 0;
   double task_comm_size = 0;
   int i;
-  int read;
+  _XBT_GNUC_UNUSED int read;
 
   read = sscanf(argv[1], "%d", &number_of_tasks);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c
index f29388183a..396b361bb7 100644
--- a/examples/msg/masterslave/masterslave_cluster.c
+++ b/examples/msg/masterslave/masterslave_cluster.c
@@ -37,7 +37,7 @@ int master(int argc, char *argv[])
   double task_comp_size = 0;
   double task_comm_size = 0;
   int i;
-  int read;
+  _XBT_GNUC_UNUSED int read;
 
   read = sscanf(argv[1], "%d", &number_of_tasks);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c
index fc1b7573f7..eff59091a9 100644
--- a/examples/msg/masterslave/masterslave_console.c
+++ b/examples/msg/masterslave/masterslave_console.c
@@ -68,10 +68,10 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
+  _XBT_GNUC_UNUSED int res;
   int id = -1;
   char mailbox[80];
-  int read;
+  _XBT_GNUC_UNUSED int read;
 
   read = sscanf(argv[1], "%d", &id);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index 58d0e4acb5..f93761eb0d 100644
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -36,7 +36,7 @@ int master(int argc, char *argv[])
   double task_comp_size = 0;
   double task_comm_size = 0;
   int i;
-  int read;
+  _XBT_GNUC_UNUSED int read;
 
   read = sscanf(argv[1], "%d", &number_of_tasks);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c
index d02543ea49..5978b0e6a5 100644
--- a/examples/msg/masterslave/masterslave_forwarder.c
+++ b/examples/msg/masterslave/masterslave_forwarder.c
@@ -39,7 +39,7 @@ int master(int argc, char *argv[])
 
   int i;
 
-  int res = sscanf(argv[1], "%d", &number_of_tasks);
+  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%d", &number_of_tasks);
   xbt_assert(res,"Invalid argument %s\n", argv[1]);
   res = sscanf(argv[2], "%lg", &task_comp_size);
   xbt_assert(res, "Invalid argument %s\n", argv[2]);
@@ -103,7 +103,7 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
+  _XBT_GNUC_UNUSED int res;
   while (1) {
     res = MSG_task_get(&(task), PORT_22);
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c
index d37e755e94..f789f1557c 100644
--- a/examples/msg/masterslave/masterslave_mailbox.c
+++ b/examples/msg/masterslave/masterslave_mailbox.c
@@ -68,10 +68,10 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
+  _XBT_GNUC_UNUSED int res;
   int id = -1;
   char mailbox[80];
-  int read;
+  _XBT_GNUC_UNUSED int read;
 
   read = sscanf(argv[1], "%d", &id);
   xbt_assert(read, "Invalid argument %s\n", argv[1]);
diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c
index 80fe67ba2b..03c5b949bb 100644
--- a/examples/msg/parallel_task/test_ptask.c
+++ b/examples/msg/parallel_task/test_ptask.c
@@ -49,7 +49,7 @@ int execute(int argc, char *argv[])
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[argc - 2], "%lg", &computation_amount);
   xbt_assert(read, "Invalid argument %s\n", argv[argc - 2]);
   read = sscanf(argv[argc - 1], "%lg", &communication_amount);
@@ -105,7 +105,7 @@ int redistribute(int argc, char *argv[])
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  int read;
+  _XBT_GNUC_UNUSED int read;
   read = sscanf(argv[argc - 1], "%lg", &communication_amount);
   xbt_assert(read, "Invalid argument %s\n", argv[argc - 1]);
   computation_duration = (double *) calloc(host_list_size, sizeof(double));
diff --git a/examples/msg/priority/priority.c b/examples/msg/priority/priority.c
index 9c5eb23cee..48aaeaf546 100644
--- a/examples/msg/priority/priority.c
+++ b/examples/msg/priority/priority.c
@@ -20,7 +20,7 @@ static int test(int argc, char *argv[])
   double priority = 1.0;
   m_task_t task = NULL;
 
-  int res = sscanf(argv[1], "%lg", &computation_amount);
+  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%lg", &computation_amount);
   xbt_assert(res, "Invalid argument %s\n", argv[1]);
   res = sscanf(argv[2], "%lg", &priority);
   xbt_assert(res, "Invalid argument %s\n", argv[2]);
diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index cf65df3092..bfb563db43 100644
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -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)
diff --git a/src/bindings/lua/lua_state_cloner.c b/src/bindings/lua/lua_state_cloner.c
index c5abebbc97..1ce36209dc 100644
--- a/src/bindings/lua/lua_state_cloner.c
+++ b/src/bindings/lua/lua_state_cloner.c
@@ -414,7 +414,7 @@ static void sglua_copy_function(lua_State* src, lua_State* dst) {
     buffer.data = xbt_new(char, buffer.capacity);
 
     /* copy the binary chunk from src into a buffer */
-    int error = lua_dump(src, sglua_memory_writer, &buffer);
+    _XBT_GNUC_UNUSED int error = lua_dump(src, sglua_memory_writer, &buffer);
     xbt_assert(!error, "Failed to dump the function from the source state: error %d",
         error);
     XBT_DEBUG("Fonction dumped: %zu bytes", buffer.size);
diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 9d878d57f0..efc561a03a 100644
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -546,7 +546,7 @@ static int run_lua_code(int argc, char **argv)
     lua_pushstring(L, argv[i]);
 
   /* call the function */
-  int err;
+  _XBT_GNUC_UNUSED int err;
   err = lua_pcall(L, argc - 1, 1, 0);
   xbt_assert(err == 0, "error running function `%s': %s", argv[0],
               lua_tostring(L, -1));
diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c
index 5117925cc2..f73dfdc4df 100644
--- a/src/simdag/sd_daxloader.c
+++ b/src/simdag/sd_daxloader.c
@@ -295,7 +295,7 @@ xbt_dynar_t SD_daxload(const char *filename)
   xbt_dynar_push(result, &root_task);
   end_task = SD_task_create_comp_seq("end", NULL, 0);
 
-  int res;
+  _XBT_GNUC_UNUSED int res;
   res = dax_lex();
   xbt_assert(!res, "Parse error in %s: %s", filename,
               dax__parse_err_msg());
@@ -392,7 +392,7 @@ xbt_dynar_t SD_daxload(const char *filename)
 
 void STag_dax__adag(void)
 {
-  double version;
+  _XBT_GNUC_UNUSED double version;
   version = dax_parse_double(A_dax__adag_version);
 
   xbt_assert(version == 2.1,
diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 72e0c4c763..9ebd945cb2 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -104,7 +104,7 @@ static void parse_process_finalize(void)
  */
 void SIMIX_launch_application(const char *file)
 {
-  int parse_status;
+  _XBT_GNUC_UNUSED int parse_status;
   xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_launch_application.");
 
diff --git a/src/surf/surf_routing_rulebased.c b/src/surf/surf_routing_rulebased.c
index 8a57a5d0b7..404335d042 100644
--- a/src/surf/surf_routing_rulebased.c
+++ b/src/surf/surf_routing_rulebased.c
@@ -179,7 +179,7 @@ static char *remplace(char *value, const char **src_list, int src_size,
 
       /* solve the indication */
       const char **param_list;
-      int param_size;
+      _XBT_GNUC_UNUSED int param_size;
       if (value[i] == 's' && value[i + 1] == 'r' && value[i + 2] == 'c') {
         param_list = src_list;
         param_size = src_size;
@@ -309,7 +309,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc,
   int ovector_dst[OVECCOUNT];
   const char **list_src = NULL;
   const char **list_dst = NULL;
-  int res;
+  _XBT_GNUC_UNUSED int res;
   xbt_dynar_foreach(rule_list, cpt, ruleroute) {
     rc_src =
         pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0,
diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index ccbfb41740..a438b8f5ac 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -268,7 +268,7 @@ void surf_parse_free_callbacks(void)
 
 void STag_surfxml_platform(void)
 {
-  double version = surf_parse_get_double(A_surfxml_platform_version);
+  _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
 
   xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
       "You're using an ancient XML file.\n"
@@ -291,7 +291,6 @@ void STag_surfxml_platform(void)
       "available in the tools/ directory of the source archive.");
 
   surfxml_call_cb_functions(STag_surfxml_platform_cb_list);
-
 }
 
 void STag_surfxml_host(void){
diff --git a/src/xbt/dict.c b/src/xbt/dict.c
index d4320000f1..d591e01b9f 100644
--- a/src/xbt/dict.c
+++ b/src/xbt/dict.c
@@ -975,7 +975,8 @@ static void count(xbt_dict_t dict, int length)
 static void count_check_get_key(xbt_dict_t dict, int length)
 {
   xbt_dict_cursor_t cursor;
-  char *key, *key2;
+  char *key;
+  _XBT_GNUC_UNUSED char *key2;
   void *data;
   int effective = 0;
 
diff --git a/src/xbt/graph.c b/src/xbt/graph.c
index 3d7cfcaf67..d2f2edfd37 100644
--- a/src/xbt/graph.c
+++ b/src/xbt/graph.c
@@ -627,7 +627,7 @@ xbt_graph_t xbt_graph_read(const char *filename,
   ETag_graphxml_edge_fun = __parse_edge;
 
   xbt_graph_parse_open(filename);
-  int res;
+  _XBT_GNUC_UNUSED int res;
   res = (*xbt_graph_parse) ();
   xbt_assert(!res, "Parse error in %s", filename);
   xbt_graph_parse_close();
diff --git a/src/xbt/graphxml_parse.c b/src/xbt/graphxml_parse.c
index a0af57e86c..e5700e43e6 100644
--- a/src/xbt/graphxml_parse.c
+++ b/src/xbt/graphxml_parse.c
@@ -125,7 +125,7 @@ int_f_void_t xbt_graph_parse = _xbt_graph_parse;
 double xbt_graph_parse_get_double(const char *string)
 {
   double result;
-  int ret = 0;
+  _XBT_GNUC_UNUSED int ret = 0;
 
   ret = sscanf(string, "%lg", &result);
   xbt_assert((ret == 1), "Parse error line %d : %s not a number",
diff --git a/teshsuite/gras/msg_handle/msg_handle.c b/teshsuite/gras/msg_handle/msg_handle.c
index 57ada11e57..af07a05271 100644
--- a/teshsuite/gras/msg_handle/msg_handle.c
+++ b/teshsuite/gras/msg_handle/msg_handle.c
@@ -30,8 +30,8 @@ int server(int argc, char *argv[])
   char *palstr;
 
   xbt_ex_t e;
-  int got_expected;
-  double now;
+  _XBT_GNUC_UNUSED int got_expected;
+  _XBT_GNUC_UNUSED double now;
 
 
   gras_init(&argc, argv);