From c5bf8d0723c36491a1bf37a9f27858b43c4c6e2c Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 17 Jan 2019 09:43:23 +0100
Subject: [PATCH] Hide usage of free() to Sonar.

---
 src/xbt/log.cpp                   | 24 ++++++++++++------------
 src/xbt/xbt_log_layout_format.cpp |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/xbt/log.cpp b/src/xbt/log.cpp
index b82a8b68e7..9f7316c0e9 100644
--- a/src/xbt/log.cpp
+++ b/src/xbt/log.cpp
@@ -51,9 +51,9 @@ static void _free_setting(void *s)
 {
   xbt_log_setting_t set = *(xbt_log_setting_t *) s;
   if (set) {
-    free(set->catname);
-    free(set->fmt);
-    free(set);
+    xbt_free(set->catname);
+    xbt_free(set->fmt);
+    xbt_free(set);
   }
 }
 
@@ -149,12 +149,12 @@ static void log_cat_exit(xbt_log_category_t cat)
   if (cat->appender) {
     if (cat->appender->free_)
       cat->appender->free_(cat->appender);
-    free(cat->appender);
+    xbt_free(cat->appender);
   }
   if (cat->layout) {
     if (cat->layout->free_)
       cat->layout->free_(cat->layout);
-    free(cat->layout);
+    xbt_free(cat->layout);
   }
 
   for (child = cat->firstChild; child != nullptr; child = child->nextSibling)
@@ -314,7 +314,7 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
       while (cpp) {
         if (res) {
           buf = bprintf("%s %s", res, cpp->name);
-          free(res);
+          xbt_free(res);
           res = buf;
         } else {
           res = xbt_strdup(cpp->name);
@@ -325,7 +325,7 @@ int _xbt_log_cat_init(xbt_log_category_t category, e_xbt_log_priority_t priority
       XBT_DEBUG("Children of %s: %s; nextSibling: %s", category->parent->name, res,
              (category->parent->nextSibling ? category->parent->nextSibling->name : "none"));
 
-      free(res);
+      xbt_free(res);
     }
   }
 
@@ -466,7 +466,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
       THROWF(arg_error, 0,
              "Unknown priority name: %s (must be one of: trace,debug,verbose,info,warning,error,critical)", eq + 1);
     }
-    free(neweq);
+    xbt_free(neweq);
   } else if (!strncmp(dot + 1, "add", (size_t) (eq - dot - 1)) ||
              !strncmp(dot + 1, "additivity", (size_t) (eq - dot - 1))) {
     char *neweq = xbt_strdup(eq + 1);
@@ -482,7 +482,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
     } else {
       set->additivity = 0;
     }
-    free(neweq);
+    xbt_free(neweq);
   } else if (!strncmp(dot + 1, "app", (size_t) (eq - dot - 1)) ||
              !strncmp(dot + 1, "appender", (size_t) (eq - dot - 1))) {
     char *neweq = xbt_strdup(eq + 1);
@@ -496,7 +496,7 @@ static xbt_log_setting_t _xbt_log_parse_setting(const char *control_string)
     } else {
       THROWF(arg_error, 0, "Unknown appender log type: '%s'", neweq);
     }
-    free(neweq);
+    xbt_free(neweq);
   } else if (!strncmp(dot + 1, "fmt", (size_t) (eq - dot - 1))) {
     set->fmt = xbt_strdup(eq + 1);
   } else {
@@ -606,7 +606,7 @@ void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app)
   if (cat->appender) {
     if (cat->appender->free_)
       cat->appender->free_(cat->appender);
-    free(cat->appender);
+    xbt_free(cat->appender);
   }
   cat->appender = app;
 }
@@ -622,7 +622,7 @@ void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay)
     if (cat->layout->free_) {
       cat->layout->free_(cat->layout);
     }
-    free(cat->layout);
+    xbt_free(cat->layout);
   }
   cat->layout = lay;
   xbt_log_additivity_set(cat, 0);
diff --git a/src/xbt/xbt_log_layout_format.cpp b/src/xbt/xbt_log_layout_format.cpp
index 5bbf144084..854968ec1b 100644
--- a/src/xbt/xbt_log_layout_format.cpp
+++ b/src/xbt/xbt_log_layout_format.cpp
@@ -176,7 +176,7 @@ static int xbt_log_layout_format_doit(xbt_log_layout_t l, xbt_log_event_t ev, co
 
 static void xbt_log_layout_format_free(xbt_log_layout_t lay)
 {
-  free(lay->data);
+  xbt_free(lay->data);
 }
 
 xbt_log_layout_t xbt_log_layout_format_new(char *arg)
-- 
2.20.1