X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83f0364920918d0380a5d538216193bfe00ddc47..250421d10cb833693e0b025d22e04313cb312b6a:/src/xbt/xbt_log_appender_file.cpp

diff --git a/src/xbt/xbt_log_appender_file.cpp b/src/xbt/xbt_log_appender_file.cpp
index 928ef1884f..8247d29ee4 100644
--- a/src/xbt/xbt_log_appender_file.cpp
+++ b/src/xbt/xbt_log_appender_file.cpp
@@ -26,10 +26,10 @@ static void free_(const s_xbt_log_appender_t* this_)
 
 xbt_log_appender_t xbt_log_appender_stream(FILE* f)
 {
-  xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
-  res->do_append         = &append_file;
-  res->free_             = nullptr;
-  res->data              = static_cast<void*>(f);
+  auto* res      = xbt_new0(s_xbt_log_appender_t, 1);
+  res->do_append = &append_file;
+  res->free_     = nullptr;
+  res->data      = static_cast<void*>(f);
   return res;
 }
 
@@ -37,12 +37,11 @@ xbt_log_appender_t xbt_log_appender_file_new(const char* arg)
 {
   if (arg == nullptr)
     return xbt_log_appender_stream(stderr);
-  xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
-  res->do_append         = &append_file;
-  res->free_             = &free_;
-  res->data              = static_cast<void*>(fopen(arg, "w"));
-  if (res->data == nullptr)
-    xbt_die("Cannot open file: %s: %s", arg, strerror(errno));
+  auto* res      = xbt_new0(s_xbt_log_appender_t, 1);
+  res->do_append = &append_file;
+  res->free_     = &free_;
+  res->data      = static_cast<void*>(fopen(arg, "w"));
+  xbt_assert(res->data != nullptr, "Cannot open file: %s: %s", arg, strerror(errno));
   return res;
 }
 
@@ -60,10 +59,9 @@ static constexpr const char* APPEND2_END_TOKEN_CLEAR = "\n                   ";
 static void open_append2_file(xbt_log_append2_file_t data){
   if(data->count<0) {
     //Roll
-    if (!data->file) {
+    if (not data->file) {
       data->file= fopen(data->filename, "w");
-      if (data->file == nullptr)
-        xbt_die("Cannot open file: %s: %s", data->filename, strerror(errno));
+      xbt_assert(data->file != nullptr, "Cannot open file: %s: %s", data->filename, strerror(errno));
     } else {
       fputs(APPEND2_END_TOKEN_CLEAR,data->file);
       fseek(data->file,0,SEEK_SET);
@@ -74,15 +72,14 @@ static void open_append2_file(xbt_log_append2_file_t data){
       fclose(data->file);
     char* pre=xbt_strdup(data->filename);
     char* sep=strchr(pre,'%');
-    if(!sep)
+    if (not sep)
       sep=pre+strlen(pre);
     const char* post    = sep + 1;
     *sep                = '\0';
     std::string newname = pre + std::to_string(data->count) + post;
     data->count++;
     data->file = fopen(newname.c_str(), "w");
-    if (data->file == nullptr)
-      xbt_die("Cannot open file: %s: %s", newname.c_str(), strerror(errno));
+    xbt_assert(data->file != nullptr, "Cannot open file: %s: %s", newname.c_str(), strerror(errno));
     xbt_free(pre);
   }
 }
@@ -116,10 +113,10 @@ static void free_append2_(const s_xbt_log_appender_t* this_)
 //For split, replace %  in the file by the current count
 xbt_log_appender_t xbt_log_appender2_file_new(const char* arg, int roll)
 {
-  xbt_log_appender_t res      = xbt_new0(s_xbt_log_appender_t, 1);
-  res->do_append              = &append2_file;
-  res->free_                  = &free_append2_;
-  xbt_log_append2_file_t data = xbt_new0(struct xbt_log_append2_file_s, 1);
+  auto* res      = xbt_new0(s_xbt_log_appender_t, 1);
+  res->do_append = &append2_file;
+  res->free_     = &free_append2_;
+  auto* data     = xbt_new0(struct xbt_log_append2_file_s, 1);
   xbt_assert(arg);
   char* buf=xbt_strdup(arg);
   char* sep=strchr(buf,':');