kill defaultlog

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1448 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 0b99261..c99b421 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -262,10 +262,9 @@ XBT_LOG_NEW_CATEGORY(surf,"All SURF categories");
 XBT_LOG_NEW_CATEGORY(msg,"All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(log,xbt,"Loggings from the logging mechanism itself");
 
-void xbt_log_init(int *argc,char **argv, const char *defaultlog) {
+void xbt_log_init(int *argc,char **argv) {
   int i,j;
   char *opt;
-  int found=0;
 
   /* Set logs and init log submodule */
   for (i=1; i<*argc; i++) {
@@ -273,7 +272,6 @@ void xbt_log_init(int *argc,char **argv, const char *defaultlog) {
        !strncmp(argv[i],"--surf-log=",strlen("--surf-log=")) ||
        !strncmp(argv[i],"--msg-log=",strlen("--msg-log=")) ||
        !strncmp(argv[i],"--xbt-log=",strlen("--xbt-log="))) {
-      found = 1;
       opt=strchr(argv[i],'=');
       opt++;
       xbt_log_control_set(opt);
@@ -287,9 +285,6 @@ void xbt_log_init(int *argc,char **argv, const char *defaultlog) {
       i--; /* compensate effect of next loop incrementation */
     }
   }
-  if (!found && defaultlog) {
-     xbt_log_control_set(defaultlog);
-  }
 }
 
 void xbt_log_exit(void) {

diff --git a/src/xbt/module.c b/src/xbt/module.c
index cbad5ef..a79815f 100644 (file)
--- a/src/xbt/module.c
+++ b/src/xbt/module.c
@@ -30,12 +30,6 @@ struct xbt_module_ {
 /** @brief Initialize the xbt mechanisms. */
 void 
 xbt_init(int *argc, char **argv) {
-  xbt_init_defaultlog(argc, argv, NULL);
-}
-
-/** @brief Initialize the xbt mechanisms. */
-void
-xbt_init_defaultlog(int *argc,char **argv, const char *defaultlog) {
   static short int first_run = 1;
   if (!first_run)
     return;
@@ -43,7 +37,7 @@ xbt_init_defaultlog(int *argc,char **argv, const char *defaultlog) {
   first_run = 0;
   VERB0("Initialize XBT");
   
-  xbt_log_init(argc,argv,defaultlog);
+  xbt_log_init(argc,argv);
 }
 
 /** @brief Finalize the xbt mechanisms. */