Useless casts.

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index 7d0f2fc..118e736 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -177,9 +177,10 @@ unit_scale::unit_scale(std::initializer_list<std::tuple<const std::string, doubl
 double surf_parse_get_value_with_unit(const char* string, const unit_scale& units, const char* entity_kind,
                                       const std::string& name, const char* error_msg, const char* default_unit)
 {
 double surf_parse_get_value_with_unit(const char* string, const unit_scale& units, const char* entity_kind,
                                       const std::string& name, const char* error_msg, const char* default_unit)
 {

-  char* ptr;
+  char* endptr;

   errno = 0;
   errno = 0;

-  double res   = strtod(string, &ptr);
+  double res      = strtod(string, &endptr);
+  const char* ptr = endptr; // for const-correctness

   if (errno == ERANGE)
     surf_parse_error(std::string("value out of range: ") + string);
   if (ptr == string)
   if (errno == ERANGE)
     surf_parse_error(std::string("value out of range: ") + string);
   if (ptr == string)


@@ -188,7 +189,7 @@ double surf_parse_get_value_with_unit(const char* string, const unit_scale& unit
     // Ok, 0 can be unit-less
     if (res != 0 && not name.empty())
       XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s", string, entity_kind, name.c_str(), error_msg);
     // Ok, 0 can be unit-less
     if (res != 0 && not name.empty())
       XBT_WARN("Deprecated unit-less value '%s' for %s %s. %s", string, entity_kind, name.c_str(), error_msg);

-    ptr = (char*)default_unit;
+    ptr = default_unit;

   }
   auto u = units.find(ptr);
   if (u == units.end())
   }
   auto u = units.find(ptr);
   if (u == units.end())

diff --git a/src/xbt/xbt_log_layout_format.cpp b/src/xbt/xbt_log_layout_format.cpp
index 06c9a73..daec92c 100644 (file)
--- a/src/xbt/xbt_log_layout_format.cpp
+++ b/src/xbt/xbt_log_layout_format.cpp
@@ -184,7 +184,7 @@ xbt_log_layout_t xbt_log_layout_format_new(const char* arg)
   xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
   res->do_layout       = &xbt_log_layout_format_doit;
   res->free_           = &xbt_log_layout_format_free;
   xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
   res->do_layout       = &xbt_log_layout_format_doit;
   res->free_           = &xbt_log_layout_format_free;

-  res->data = xbt_strdup((char *) arg);
+  res->data            = xbt_strdup(arg);

 
   return res;
 }
 
   return res;
 }