From 7054d0dab4f8fa3defb074cb76aad4427fc4a3c1 Mon Sep 17 00:00:00 2001
From: Kostyantyn Vorobyov <kostyantyn.vorobyov@cea.fr>
Date: Thu, 18 Feb 2016 10:35:56 +0100
Subject: [PATCH] [RTL] Adjustment of debug functions so only top-levels ones
are visible externally for the case when a program is compiled with debug
features
---
.../e-acsl/share/e-acsl/adt_models/e_acsl_adt_mmodel.h | 4 +++-
src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h | 2 +-
src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_list.h | 4 ++--
src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_splaytree.h | 2 +-
src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_tree.h | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_mmodel.h b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_mmodel.h
index bc59349979d..94cb504bae2 100644
--- a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_mmodel.h
+++ b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_adt_mmodel.h
@@ -409,9 +409,11 @@ void __e_acsl_print_block (struct _block * ptr) {
}
}
+static void debug_struct();
+
/* print the content of the abstract structure */
void __e_acsl_debug() {
- __e_acsl_debug_struct();
+ debug_struct();
}
#endif
diff --git a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h
index f02290d5df7..fea8a586a37 100644
--- a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h
+++ b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_bittree.h
@@ -454,7 +454,7 @@ static void debug_rec (struct bittree * ptr, int depth) {
/* print the content of the structure */
/*@ assigns \nothing;
@*/
-void __e_acsl_debug_struct () {
+static void debug_struct () {
DLOG("------------DEBUG\n");
debug_rec(__root, 0);
DLOG("-----------------\n");
diff --git a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_list.h b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_list.h
index 4ccfb00d097..b3224d05622 100644
--- a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_list.h
+++ b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_list.h
@@ -28,7 +28,7 @@
#include "e_acsl_assert.h"
#include "e_acsl_adt_api.h"
-struct _node {
+static struct _node {
struct _block * value;
struct _node * next;
};
@@ -127,7 +127,7 @@ static void __clean_struct() {
/* DEBUG */
/*********************/
#ifdef E_ACSL_DEBUG
-void __e_acsl_debug_struct() {
+static void debug_struct() {
struct _node * tmp = __list;
DLOG("\t\t\t------------DEBUG\n");
for(; tmp != NULL; tmp = tmp->next) {
diff --git a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_splaytree.h b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_splaytree.h
index 8fe4837efbf..4d92cccd3bd 100644
--- a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_splaytree.h
+++ b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_splaytree.h
@@ -192,7 +192,7 @@ static void debug_rec(struct _node * ptr) {
debug_rec(ptr->right);
}
-void __e_acsl_debug_struct() {
+static void debug_struct() {
DLOG("\t\t\t------------DEBUG\n");
debug_rec(__root);
DLOG("\t\t\t-----------------\n");
diff --git a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_tree.h b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_tree.h
index 4e55bd5fde0..efaec5ffe87 100644
--- a/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_tree.h
+++ b/src/plugins/e-acsl/share/e-acsl/adt_models/e_acsl_tree.h
@@ -152,7 +152,7 @@ static void debug_rec(struct _node * ptr) {
debug_rec(ptr->right);
}
-void __e_acsl_debug_struct() {
+static void debug_struct() {
DLOG("\t\t\t------------DEBUG\n");
__debug_rec(__root);
DLOF("\t\t\t-----------------\n");
--
GitLab