From 38b3663035d740e765a6c354cc06157760922d90 Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Tue, 5 Aug 2014 14:11:14 +0200
Subject: [PATCH] [memory model] fix bug #1838 about memset
---
.../e-acsl/share/e-acsl/memory_model/e_acsl_mmodel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/e-acsl/share/e-acsl/memory_model/e_acsl_mmodel.c b/src/plugins/e-acsl/share/e-acsl/memory_model/e_acsl_mmodel.c
index cb1d9e85836..3d23927247e 100644
--- a/src/plugins/e-acsl/share/e-acsl/memory_model/e_acsl_mmodel.c
+++ b/src/plugins/e-acsl/share/e-acsl/memory_model/e_acsl_mmodel.c
@@ -47,7 +47,7 @@ void __warning(const char* fct_name) {
}
-void* __e_acsl_memset (void* dest, int val, size_t len) {
+void* __e_acsl_mmodel_memset (void* dest, int val, size_t len) {
unsigned char *ptr = (unsigned char*)dest;
while (len-- > 0)
*ptr++ = val;
@@ -175,7 +175,7 @@ void* __realloc(void* ptr, size_t size) {
else {
int nb = needed_bytes(size);
tmp->init_ptr = malloc(nb);
- __e_acsl_memset(tmp->init_ptr, 0xFF, nb);
+ __e_acsl_mmodel_memset(tmp->init_ptr, 0xFF, nb);
if(size%8 != 0)
tmp->init_ptr[size/8] <<= (8 - size%8);
}
@@ -242,7 +242,7 @@ void __initialize (void * ptr, size_t size) {
if(tmp->init_cpt == 0) {
int nb = needed_bytes(tmp->size);
tmp->init_ptr = malloc(nb);
- __e_acsl_memset(tmp->init_ptr, 0, nb);
+ __e_acsl_mmodel_memset(tmp->init_ptr, 0, nb);
}
for(i = 0; i < size; i++) {
--
GitLab