Add the possibility to remove an item in the middle of the list.

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

diff --git a/src/xbt/log_default_appender.c b/src/xbt/log_default_appender.c
index b4e3054..28c5f36 100644 (file)
--- a/src/xbt/log_default_appender.c
+++ b/src/xbt/log_default_appender.c
@@ -8,34 +8,36 @@
 /* This program is free software; you can redistribute it and/or modify it
    under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "gras_private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "xbt/error.h"
 #include <stdio.h>
 
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log_app,log,"default logging handler");
 
 /**
  * The root category's default logging function.
  */
 
-extern const char *gras_log_priority_names[7];
+extern const char *xbt_log_priority_names[7];
 
-static void append_file(gras_log_appender_t* this, gras_log_event_t* ev,
+static void append_file(xbt_log_appender_t this, xbt_log_event_t ev,
                        const char *fmt);
 
 /*
-struct gras_log_appender_file_s {
-  gras_log_appender_t* appender;
+struct xbt_log_appender_file_s {
+  xbt_log_appender_t* appender;
   FILE *file;
 };
 */
 
-static gras_log_appender_t gras_log_appender_file = { append_file, NULL } ;
+static s_xbt_log_appender_t xbt_log_appender_file = { append_file, NULL } ;
 /* appender_data=FILE* */
 
-gras_log_appender_t* gras_log_default_appender  = &gras_log_appender_file;
+xbt_log_appender_t xbt_log_default_appender  = &xbt_log_appender_file;
 
-static void append_file(gras_log_appender_t* this, 
-                       gras_log_event_t* ev, 
+static void append_file(xbt_log_appender_t this,
+                       xbt_log_event_t ev, 
                        const char *fmt) {
 
   /* TODO: define a format field in struct for timestamp, etc.
@@ -44,15 +46,15 @@ static void append_file(gras_log_appender_t* this,
     if ((FILE*)(this->appender_data) == NULL)
       this->appender_data = (void*)stderr;
     
-    gras_assert0(ev->priority>=0,
+    xbt_assert0(ev->priority>=0,
                 "Negative logging priority naturally forbidden");
-    gras_assert1(ev->priority<sizeof(gras_log_priority_names),
+    xbt_assert1(ev->priority<sizeof(xbt_log_priority_names),
                 "Priority %d is greater than the biggest allowed value",
                 ev->priority);
 
     fprintf(stderr, "%s:%d: ", ev->fileName, ev->lineNum);
     fprintf(stderr, "[%s/%s] ", 
-           ev->cat->name, gras_log_priority_names[ev->priority]);
+           ev->cat->name, xbt_log_priority_names[ev->priority]);
     vfprintf(stderr, fmt, ev->ap);
     fprintf(stderr, "\n");
 }