Remove side effects from xbt_asserts calls

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

diff --git a/examples/msg/alias/masterslave_forwarder_with_alias.c b/examples/msg/alias/masterslave_forwarder_with_alias.c
index b1aae7f..19e967f 100644 (file)
--- a/examples/msg/alias/masterslave_forwarder_with_alias.c
+++ b/examples/msg/alias/masterslave_forwarder_with_alias.c
@@ -38,16 +38,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
-
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  int read;
+
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[3]);
 
   {
     /*  Task creation */

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index f63ab58..d48e5c5 100644 (file)
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -51,8 +51,9 @@ int master(int argc, char *argv[])
   }
 
   /* data size */
-  xbt_assert1(sscanf(argv[1], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[1]);
+  int read;
+  read = sscanf(argv[1], "%lg", &task_comm_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
 
   /* slave name */
   slavename = argv[2];

diff --git a/examples/msg/icomms/peer.c b/examples/msg/icomms/peer.c
index 7b6ef56..501ec38 100644 (file)
--- a/examples/msg/icomms/peer.c
+++ b/examples/msg/icomms/peer.c
@@ -95,7 +95,9 @@ int receiver(int argc, char *argv[])
   XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time,
         sleep_test_time);
 
-  xbt_assert1(sscanf(argv[1], "%d", &id),
+  int read;
+  read = sscanf(argv[1], "%d", &id);
+  xbt_assert1(read,
               "Invalid argument %s\n", argv[1]);
 
   MSG_process_sleep(sleep_start_time);

diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index be9403f..19577a5 100644 (file)
--- a/examples/msg/masterslave/masterslave_bypass.c
+++ b/examples/msg/masterslave/masterslave_bypass.c
@@ -164,16 +164,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
-
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  int read;
+
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[3]);
 
   {                             /*  Task creation */
     char sprintf_buffer[64];

diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c
index 3a1cb0c..d58b53f 100644 (file)
--- a/examples/msg/masterslave/masterslave_cluster.c
+++ b/examples/msg/masterslave/masterslave_cluster.c
@@ -36,16 +36,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
-
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  int read;
+
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[3]);
 
   {                             /*  Task creation */
     char sprintf_buffer[64];

diff --git a/examples/msg/masterslave/masterslave_console.c b/examples/msg/masterslave/masterslave_console.c
index fd78488..0580cd2 100644 (file)
--- a/examples/msg/masterslave/masterslave_console.c
+++ b/examples/msg/masterslave/masterslave_console.c
@@ -71,9 +71,10 @@ int slave(int argc, char *argv[])
   int res;
   int id = -1;
   char mailbox[80];
+  int read;
 
-  xbt_assert1(sscanf(argv[1], "%d", &id),
-              "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[1], "%d", &id);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
 
   sprintf(mailbox, "slave-%d", id);
 

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index bd8c4cc..628e77d 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -35,16 +35,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
-
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  int read;
+
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert1(read, "Invalid argument %s\n", argv[3]);
 
   {                             /* Process organisation */
     slaves_count = argc - 4;

diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c
index e4e6759..fd81fcb 100644 (file)
--- a/examples/msg/masterslave/masterslave_mailbox.c
+++ b/examples/msg/masterslave/masterslave_mailbox.c
@@ -71,9 +71,10 @@ int slave(int argc, char *argv[])
   int res;
   int id = -1;
   char mailbox[80];
+  int read;
 
-  xbt_assert1(sscanf(argv[1], "%d", &id),
-              "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[1], "%d", &id);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
 
   sprintf(mailbox, "slave-%d", id);
 

diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c
index 53ac24b..f4a79a4 100644 (file)
--- a/examples/msg/parallel_task/test_ptask.c
+++ b/examples/msg/parallel_task/test_ptask.c
@@ -49,10 +49,11 @@ int execute(int argc, char *argv[])
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  xbt_assert1(sscanf(argv[argc - 2], "%lg", &computation_amount),
-              "Invalid argument %s\n", argv[argc - 2]);
-  xbt_assert1(sscanf(argv[argc - 1], "%lg", &communication_amount),
-              "Invalid argument %s\n", argv[argc - 1]);
+  int read;
+  read = sscanf(argv[argc - 2], "%lg", &computation_amount);
+  xbt_assert1(read, "Invalid argument %s\n", argv[argc - 2]);
+  read = sscanf(argv[argc - 1], "%lg", &communication_amount);
+  xbt_assert1(read, "Invalid argument %s\n", argv[argc - 1]);
   computation_duration = (double *) calloc(host_list_size, sizeof(double));
   communication_table =
       (double *) calloc(host_list_size * host_list_size, sizeof(double));
@@ -104,8 +105,9 @@ int redistribute(int argc, char *argv[])
                 "Unknown host %s. Stopping Now! ", argv[i]);
   }
 
-  xbt_assert1(sscanf(argv[argc - 1], "%lg", &communication_amount),
-              "Invalid argument %s\n", argv[argc - 1]);
+  int read;
+  read = sscanf(argv[argc - 1], "%lg", &communication_amount);
+  xbt_assert1(read, "Invalid argument %s\n", argv[argc - 1]);
   computation_duration = (double *) calloc(host_list_size, sizeof(double));
   communication_table =
       (double *) calloc(host_list_size * host_list_size, sizeof(double));

diff --git a/src/bindings/lua/simgrid_lua.c b/src/bindings/lua/simgrid_lua.c
index 019dc95..7dbf010 100644 (file)
--- a/src/bindings/lua/simgrid_lua.c
+++ b/src/bindings/lua/simgrid_lua.c
@@ -523,9 +523,10 @@ static int run_lua_code(int argc, char **argv)
     lua_pushstring(L, argv[i]);
 
   // Call the function (in resume)
-  xbt_assert2(lua_pcall(L, argc - 1, 1, 0) == 0,
-              "error running function `%s': %s", argv[0], lua_tostring(L,
-                                                                       -1));
+  int err;
+  err = lua_pcall(L, argc - 1, 1, 0);
+  xbt_assert2(err == 0, "error running function `%s': %s", argv[0],
+              lua_tostring(L, -1));
 
   /* retrieve result */
   if (lua_isnumber(L, -1)) {

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index e8a0213..7936bf1 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -67,8 +67,9 @@ void gras_trp_init(void)
       WSADATA wsaData;
 
       wVersionRequested = MAKEWORD(2, 0);
-      xbt_assert0(WSAStartup(wVersionRequested, &wsaData) == 0,
-                  "Cannot find a usable WinSock DLL");
+      int res;
+      res = WSAStartup(wVersionRequested, &wsaData);
+      xbt_assert0(res == 0, "Cannot find a usable WinSock DLL");
 
       /* Confirm that the WinSock DLL supports 2.0. */
       /* Note that if the DLL supports versions greater    */
@@ -84,8 +85,9 @@ void gras_trp_init(void)
 #elif HAVE_WINSOCK_H
     {
       WSADATA wsaData;
-      xbt_assert0(WSAStartup(0x0101, &wsaData) == 0,
-                  "Cannot find a usable WinSock DLL");
+      int res;
+      res = WSAStartup(0x0101, &wsaData);
+      xbt_assert0(res == 0, "Cannot find a usable WinSock DLL");
       XBT_INFO("Found and initialized winsock");
     }
 #endif

diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c
index c065fe0..69d4ad5 100644 (file)
--- a/src/simdag/sd_daxloader.c
+++ b/src/simdag/sd_daxloader.c
@@ -295,7 +295,9 @@ xbt_dynar_t SD_daxload(const char *filename)
   xbt_dynar_push(result, &root_task);
   end_task = SD_task_create_comp_seq("end", NULL, 0);
 
-  xbt_assert2(!dax_lex(), "Parse error in %s: %s", filename,
+  int res;
+  res = dax_lex();
+  xbt_assert2(!res, "Parse error in %s: %s", filename,
               dax__parse_err_msg());
   dax__delete_buffer(input_buffer);
   fclose(in_file);
@@ -393,7 +395,7 @@ void STag_dax__adag(void)
   double version;
   version = dax_parse_double(A_dax__adag_version);
 
-  xbt_assert1((version == 2.1),
+  xbt_assert1(version == 2.1,
               "Expected version 2.1 in <adag> tag, got %f. Fix the parser or your file",
               version);
 }

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index 9283f62..6b1f1f2 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -104,7 +104,9 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code,
      otherwise is the context for maestro */
   if (code) {
 
-    xbt_assert2(getcontext(&(context->uc)) == 0,
+    int res;
+    res = getcontext(&(context->uc));
+    xbt_assert2(res == 0,
                 "Error in context saving: %d (%s)", errno,
                 strerror(errno));
 

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 688156c..30de78e 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -2620,6 +2620,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_dynar_foreach(rule_list, cpt, ruleroute) {
     rc_src =
         pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0,
@@ -2629,12 +2630,10 @@ static route_extended_t rulebased_get_route(routing_component_t rc,
           pcre_exec(ruleroute->re_dst, NULL, dst, dst_length, 0, 0,
                     ovector_dst, OVECCOUNT);
       if (rc_dst >= 0) {
-        xbt_assert1(!pcre_get_substring_list
-                    (src, ovector_src, rc_src, &list_src),
-                    "error solving substring list for src \"%s\"", src);
-        xbt_assert1(!pcre_get_substring_list
-                    (dst, ovector_dst, rc_dst, &list_dst),
-                    "error solving substring list for src \"%s\"", dst);
+        res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src);
+        xbt_assert1(!res, "error solving substring list for src \"%s\"", src);
+        res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst)
+        xbt_assert1(!res, "error solving substring list for src \"%s\"", dst);
         char *link_name;
         xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) {
           char *new_link_name =

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index ad572ce..4941414 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -573,9 +573,8 @@ double get_cpu_power(const char *power)
       generator = xbt_malloc(q - (p + 6) + 1);
       memcpy(generator, p + 6, q - (p + 6));
       generator[q - (p + 6)] = '\0';
-      xbt_assert1((random =
-                   xbt_dict_get_or_null(random_data_list, generator)),
-                  "Random generator %s undefined", generator);
+      random = xbt_dict_get_or_null(random_data_list, generator);
+      xbt_assert1(random, "Random generator %s undefined", generator);
       power_scale = random_generate(random);
     }
   } else {

diff --git a/src/xbt/config.c b/src/xbt/config.c
index 47d9cd2..a43ac15 100644 (file)
--- a/src/xbt/config.c
+++ b/src/xbt/config.c
@@ -321,7 +321,8 @@ void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry)
   xbt_assert1(tok, "Invalid maximum in config element descriptor %s",
               entry);
 
-  xbt_assert2(*(tok++) == '_',
+  tok++;
+  xbt_assert2(*tok == '_',
               "Invalid config element descriptor: %s%s", entry,
               "; Should be <name>:<min nb>_to_<max nb>_<type>");
 

diff --git a/src/xbt/graph.c b/src/xbt/graph.c
index b52ecaa..9067b1a 100644 (file)
--- a/src/xbt/graph.c
+++ b/src/xbt/graph.c
@@ -626,7 +626,9 @@ xbt_graph_t xbt_graph_read(const char *filename,
   ETag_graphxml_edge_fun = __parse_edge;
 
   xbt_graph_parse_open(filename);
-  xbt_assert1((!(*xbt_graph_parse) ()), "Parse error in %s", filename);
+  int res;
+  res = (*xbt_graph_parse) ();
+  xbt_assert1(!res, "Parse error in %s", filename);
   xbt_graph_parse_close();
 
   graph = parsed_graph;