X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7410b72db09489e8b9d3ee3cb087f35882397d93..1fb1a61ebaa8a6b71c1a02f0213157d94bf54be0:/src/xbt/xbt_log_appender_file.c

diff --git a/src/xbt/xbt_log_appender_file.c b/src/xbt/xbt_log_appender_file.c
index 0fa6906530..2e938d1afa 100644
--- a/src/xbt/xbt_log_appender_file.c
+++ b/src/xbt/xbt_log_appender_file.c
@@ -15,25 +15,16 @@ static void append_file(xbt_log_appender_t this_, char *str) {
   fputs(str, (FILE *) this_->data);
 }
 
-static void smpi_append_file(xbt_log_appender_t this_, char *str) {
-  fputs(str, (FILE *) this_->data);
-}
-
 static void free_(xbt_log_appender_t this_) {
   if (this_->data != stderr)
     fclose(this_->data);
 }
 
-XBT_LOG_EXTERNAL_CATEGORY(smpi); // To detect if SMPI is inited
-
 xbt_log_appender_t xbt_log_appender_file_new(char *arg) {
 
   xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
-  if (_XBT_LOGV(smpi).initialized) // HACK to detect if we run in SMPI mode. Relies on MAIN__ source disposition
-    res->do_append = smpi_append_file;
-  else
-    res->do_append = append_file;
-  res->free_ = free_;
+  res->do_append         = &append_file;
+  res->free_             = &free_;
   if (arg)
     res->data = (void *) fopen(arg, "w");
   else
@@ -93,10 +84,6 @@ static void append2_file(xbt_log_appender_t this_, char *str) {
    }
 }
 
-static void smpi_append2_file(xbt_log_appender_t this_, char *str) {
-  append2_file(this_,str);
-}
-
 static void free_append2_(xbt_log_appender_t this_) {
   FILE* f=((xbt_log_append2_file_t)(this_->data))->file;
   if (f)
@@ -109,12 +96,9 @@ static void free_append2_(xbt_log_appender_t this_) {
 //For split, replace %  in the file by the current count
 xbt_log_appender_t xbt_log_appender2_file_new(char *arg,int roll) {
 
-  xbt_log_appender_t res = xbt_new0(s_xbt_log_appender_t, 1);
-  if (_XBT_LOGV(smpi).initialized) // HACK to detect if we run in SMPI mode. Relies on MAIN__ source disposition
-    res->do_append = smpi_append2_file;
-  else
-    res->do_append = append2_file;
-  res->free_ = free_append2_;
+  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);
   xbt_assert(arg);
   char* buf=xbt_strdup(arg);
@@ -130,7 +114,7 @@ xbt_log_appender_t xbt_log_appender2_file_new(char *arg,int roll) {
     data->count=-1;
   else
     data->count=0;
-  open_append2_file(data);  
+  open_append2_file(data);
   res->data = data;
   return res;
 }