From: agiersch <agiersch@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 27 Jan 2011 10:51:55 +0000 (+0000)
Subject: Always free cat->layout on xbt_log_layout_set.
X-Git-Tag: v3.6_beta2~416
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/accfd692f05242b17dd620dc3494426572604aa7?hp=efbf2ac15b2739e4a24faec602c902f5737c408a

Always free cat->layout on xbt_log_layout_set.

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

diff --git a/src/xbt/log.c b/src/xbt/log.c
index d00f8601fd..b4e3010b4c 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -1060,13 +1060,11 @@ void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay)
          cat->name);
     xbt_log_appender_set(cat, xbt_log_appender_file_new(NULL));
   }
-  if (cat->layout && cat != &_XBT_LOGV(root)) {
-    /* better leak the default layout than check every categories to
-       change it */
+  if (cat->layout) {
     if (cat->layout->free_) {
       cat->layout->free_(cat->layout);
-      free(cat->layout);
     }
+    free(cat->layout);
   }
   cat->layout = lay;
   xbt_log_additivity_set(cat, 0);