Use strtol instead of sscanf+sprintf for parsing and error checking.

[simgrid.git] / src / xbt / backtrace_linux.c

diff --git a/src/xbt/backtrace_linux.c b/src/xbt/backtrace_linux.c
index 1c6b5bc..e57e486 100644 (file)
--- a/src/xbt/backtrace_linux.c
+++ b/src/xbt/backtrace_linux.c
@@ -56,7 +56,7 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
   struct stat stat_buf;
   char *binary_name = NULL;
 
-  xbt_assert0(e
+  xbt_assert(e
               && e->used,
               "Backtrace not setup yet, cannot set it up for display");
 
@@ -153,13 +153,13 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
     XBT_DEBUG("Looking for symbol %d, addr = '%s'", i, addrs[i]);
     fgets_res = fgets(line_func, 1024, pipe);
     if (fgets_res == NULL)
-      THROW2(system_error, 0,
+      THROWF(system_error, 0,
              "Cannot run fgets to look for symbol %d, addr %s", i,
              addrs[i]);
     line_func[strlen(line_func) - 1] = '\0';
     fgets_res = fgets(line_pos, 1024, pipe);
     if (fgets_res == NULL)
-      THROW2(system_error, 0,
+      THROWF(system_error, 0,
              "Cannot run fgets to look for symbol %d, addr %s", i,
              addrs[i]);
     line_pos[strlen(line_pos) - 1] = '\0';
@@ -185,10 +185,8 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
       maps_name = bprintf("/proc/%d/maps", (int) getpid());
       maps = fopen(maps_name, "r");
 
-      sscanf(addrs[i], "%lx", &addr);
-      sprintf(maps_buff, "%#lx", addr);
-
-      if (strcmp(addrs[i], maps_buff)) {
+      addr = strtol(addrs[i], &p, 16);
+      if (*p != '\0') {
         XBT_CRITICAL("Cannot parse backtrace address '%s' (addr=%#lx)",
                   addrs[i], addr);
       }
@@ -261,12 +259,12 @@ void xbt_ex_setup_backtrace(xbt_ex_t * e)
         }
         fgets_res = fgets(line_func, 1024, subpipe);
         if (fgets_res == NULL)
-          THROW1(system_error, 0, "Cannot read result of subcommand %s",
+          THROWF(system_error, 0, "Cannot read result of subcommand %s",
                  subcmd);
         line_func[strlen(line_func) - 1] = '\0';
         fgets_res = fgets(line_pos, 1024, subpipe);
         if (fgets_res == NULL)
-          THROW1(system_error, 0, "Cannot read result of subcommand %s",
+          THROWF(system_error, 0, "Cannot read result of subcommand %s",
                  subcmd);
         line_pos[strlen(line_pos) - 1] = '\0';
         pclose(subpipe);