From fc43da94534a0781d514e47f6a7eef20c48933f0 Mon Sep 17 00:00:00 2001
From: Basile Desloges <basile.desloges@cea.fr>
Date: Fri, 20 Sep 2024 14:36:59 +0200
Subject: [PATCH] [libc] Update tests oracles

---
 .../tests/bts/oracle/bts2252.res.oracle       |  14 +-
 .../e-acsl/tests/bts/oracle/gen_bts2252.c     |  12 +-
 .../tests/bts/oracle/gen_issue-eacsl-40.c     |  18 +-
 .../bts/oracle/issue-eacsl-40.res.oracle      |  52 +--
 .../e-acsl/tests/builtin/oracle/gen_strcat.c  |   2 +-
 .../e-acsl/tests/builtin/oracle/gen_strcmp.c  |   4 +-
 .../e-acsl/tests/builtin/oracle/gen_strcpy.c  |   4 +-
 .../e-acsl/tests/builtin/oracle/gen_strlen.c  |   4 +-
 .../tests/builtin/oracle/strcat.res.oracle    |   6 +-
 .../tests/builtin/oracle/strcmp.res.oracle    |  18 +-
 .../tests/builtin/oracle/strcpy.res.oracle    |  18 +-
 .../tests/builtin/oracle/strlen.res.oracle    |  18 +-
 .../concurrency/oracle/gen_parallel_threads.c |   4 +-
 .../oracle/gen_sequential_threads.c           |   2 +-
 .../concurrency/oracle/gen_threads_debug.c    |   4 +-
 .../oracle/gen_threads_safe_locations.c       |   2 +-
 .../oracle/parallel_threads.res.oracle        |   8 +-
 .../oracle/threads_debug.res.oracle           |   8 +-
 .../tests/format/oracle/fprintf.res.oracle    |  12 +-
 .../e-acsl/tests/format/oracle/gen_fprintf.c  |   6 +-
 .../e-acsl/tests/format/oracle/gen_printf.c   |  16 +-
 .../tests/format/oracle/printf.res.oracle     |  34 +-
 .../e-acsl/tests/libc/oracle/file.res.oracle  |  52 +--
 .../e-acsl/tests/libc/oracle/gen_file.c       |  18 +-
 .../e-acsl/tests/libc/oracle/gen_mem.c        |  22 +-
 .../e-acsl/tests/libc/oracle/gen_str.c        |  24 +-
 .../e-acsl/tests/libc/oracle/mem.res.oracle   |  70 +--
 .../e-acsl/tests/libc/oracle/str.res.oracle   |  62 +--
 .../tests/memory/oracle/gen_hidden_malloc.c   |  14 +-
 .../e-acsl/tests/memory/oracle/gen_memalign.c |   8 +-
 .../e-acsl/tests/memory/oracle/gen_vdso.c     |  10 +-
 .../memory/oracle/hidden_malloc.res.oracle    |  14 +-
 .../tests/memory/oracle/mainargs.res.oracle   |  10 +-
 .../tests/memory/oracle/memalign.res.oracle   |  12 +-
 .../tests/memory/oracle/vdso.res.oracle       |   2 +-
 .../tests/temporal/oracle/gen_t_fun_lib.c     |  14 +-
 .../tests/temporal/oracle/gen_t_memcpy.c      |  16 +-
 .../temporal/oracle/t_fun_lib.res.oracle      |  14 +-
 .../tests/temporal/oracle/t_memcpy.res.oracle |  50 +--
 .../tests/md/oracle/cwe126.res.oracle         |   2 +-
 .../oracle/builtin_with_body.res.oracle       |   2 +-
 .../tests/nonterm/oracle/n6.res.oracle        |   2 +-
 .../tests/erroneous/oracle/exec.res.oracle    |  11 +-
 .../tests/erroneous/oracle/printf.res.oracle  |  18 +-
 .../tests/known/oracle/exec.res.oracle        |  12 +-
 .../oracle/exec_failed_requirement.res.oracle |  12 +-
 .../tests/known/oracle/fcntl.res.oracle       |   6 +-
 .../tests/known/oracle/open.res.oracle        |   6 +-
 .../tests/known/oracle/open_wrong.res.oracle  |   6 +-
 .../tests/known/oracle/openat.res.oracle      |   6 +-
 .../tests/known/oracle/printf.res.oracle      |  30 +-
 .../oracle/printf_garbled_mix.res.oracle      |  18 +-
 .../oracle/printf_wrong_arity.res.oracle      |  18 +-
 .../oracle/printf_wrong_pointers.res.oracle   |  18 +-
 .../oracle/printf_wrong_types.res.oracle      |  36 +-
 .../tests/known/oracle/scanf.0.res.oracle     |  18 +-
 .../tests/known/oracle/scanf.1.res.oracle     |  18 +-
 .../tests/known/oracle/scanf_loop.res.oracle  |  18 +-
 .../tests/known/oracle/scanf_wrong.res.oracle |  18 +-
 .../tests/known/oracle/snprintf.res.oracle    |  22 +-
 .../tests/known/oracle/stdio_print.res.oracle |  18 +-
 .../tests/known/oracle/stdio_scan.res.oracle  |  18 +-
 .../tests/known/oracle/swprintf.res.oracle    |  32 +-
 .../tests/known/oracle/wchar.res.oracle       |  30 +-
 .../terminates_call_options.0.res.oracle      |   2 +-
 .../terminates_call_options.1.res.oracle      |   2 +-
 .../terminates_call_options.0.res.oracle      |   2 +-
 .../terminates_call_options.1.res.oracle      |   2 +-
 .../wp_plugin/oracle/string_c.res.oracle      |  18 +-
 tests/builtins/oracle/alloc_weak.res.oracle   |   2 +-
 tests/builtins/oracle/fam.res.oracle          |   2 +-
 tests/builtins/oracle/imprecise.res.oracle    |   2 +-
 .../builtins/oracle/malloc_bug_tr.res.oracle  |   2 +-
 tests/builtins/oracle/memchr.res.oracle       |   2 +-
 tests/builtins/oracle/memcpy.0.res.oracle     | 227 +++++-----
 tests/builtins/oracle/memcpy2.res.oracle      |   2 +-
 .../builtins/oracle/memcpy_invalid.res.oracle |   2 +-
 tests/builtins/oracle/memset.res.oracle       |   2 +-
 .../oracle/memset_malloc_0.res.oracle         |   2 +-
 .../builtins/oracle/precise_memset.res.oracle |   2 +-
 tests/builtins/oracle/strchr.res.oracle       |   4 +-
 tests/builtins/oracle/strlen.res.oracle       |   2 +-
 tests/builtins/oracle/strnlen2.res.oracle     |   2 +-
 tests/builtins/oracle/wcslen.res.oracle       |   2 +-
 tests/builtins/oracle/write-const.res.oracle  |   4 +-
 tests/fc_script/make-machdep.t/run.t          |   1 +
 tests/idct/oracle/ieee_1180_1990.res.oracle   | 405 ++++++++++--------
 .../oracle_multidim/ieee_1180_1990.res.oracle |  38 +-
 tests/libc/oracle/argz_c.res.oracle           |  38 +-
 tests/libc/oracle/coverage.res.oracle         |   2 +-
 tests/libc/oracle/fc_libc.0.res.oracle        |   3 +-
 tests/libc/oracle/fc_libc.2.res.oracle        |   1 +
 tests/libc/oracle/fc_libc.4.res.oracle        |   5 +
 tests/libc/oracle/netdb_c.res.oracle          |  12 +-
 tests/libc/oracle/pwd_c.res.oracle            |   2 +-
 tests/libc/oracle/search_h.res.oracle         |   2 +-
 tests/libc/oracle/socket.0.res.oracle         |   2 +-
 tests/libc/oracle/socket.1.res.oracle         |   2 +-
 tests/libc/oracle/stdatomic_c.res.oracle      |   2 +-
 tests/libc/oracle/stdio_h.res.oracle          |   2 +-
 tests/libc/oracle/stdlib_c.2.res.oracle       |   2 +-
 tests/libc/oracle/stdlib_c_env.res.oracle     |   4 +-
 tests/libc/oracle/string_c.res.oracle         |  84 ++--
 tests/libc/oracle/string_c_generic.res.oracle |  54 +--
 tests/libc/oracle/string_c_strchr.res.oracle  |  14 +-
 tests/libc/oracle/string_c_strstr.res.oracle  |   8 +-
 tests/libc/oracle/string_h.res.oracle         |  12 +-
 tests/libc/oracle/sys_select.res.oracle       |   4 +-
 tests/libc/oracle/sys_stat_h.res.oracle       |   2 +-
 tests/libc/oracle/sys_time_h.res.oracle       |   4 +
 tests/metrics/oracle/libc.json                |  16 +
 tests/rte/oracle/value_rte.res.oracle         | 365 +++++++++-------
 tests/syntax/oracle/gnu-asm-aesni.res.oracle  |  16 +-
 tests/value/oracle/empty_struct2.res.oracle   |   2 +-
 tests/value/oracle/empty_union.res.oracle     |   2 +-
 115 files changed, 1318 insertions(+), 1148 deletions(-)

diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts2252.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts2252.res.oracle
index af0ce5a8cf2..7220b0bed85 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/bts2252.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/bts2252.res.oracle
@@ -1,5 +1,5 @@
 [e-acsl] beginning translation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:431: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:447: Warning: 
   no assigns clause generated for function valid_read_nstring because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:281: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
@@ -7,25 +7,25 @@
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:440: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:456: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:443: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:459: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:430: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:446: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:430: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:446: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:441: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:457: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:444: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:460: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
index ed9c13bf241..7ea8d5d9304 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
@@ -140,7 +140,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_2.pred_txt = "\\valid(dest + (0 .. n - 1))";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_2.fct = "strncpy";
-    __gen_e_acsl_assert_data_2.line = 432;
+    __gen_e_acsl_assert_data_2.line = 448;
     __gen_e_acsl_assert_data_2.name = "room_nstring";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -172,7 +172,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_4.pred_txt = "\\valid_read(dest + (0 .. n - 1))";
     __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_4.fct = "strncpy";
-    __gen_e_acsl_assert_data_4.line = 434;
+    __gen_e_acsl_assert_data_4.line = 450;
     __gen_e_acsl_assert_data_4.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read_2,& __gen_e_acsl_assert_data_4);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -202,7 +202,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_5.pred_txt = "\\valid_read(src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_5.fct = "strncpy";
-    __gen_e_acsl_assert_data_5.line = 434;
+    __gen_e_acsl_assert_data_5.line = 450;
     __gen_e_acsl_assert_data_5.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read_3,& __gen_e_acsl_assert_data_5);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
@@ -248,7 +248,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_3.pred_txt = "\\separated(dest + (0 .. n - 1), src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_3.fct = "strncpy";
-    __gen_e_acsl_assert_data_3.line = 434;
+    __gen_e_acsl_assert_data_3.line = 450;
     __gen_e_acsl_assert_data_3.name = "separation";
     __e_acsl_assert(__gen_e_acsl_separated,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -283,7 +283,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_6.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_6.fct = "strncpy";
-    __gen_e_acsl_assert_data_6.line = 437;
+    __gen_e_acsl_assert_data_6.line = 453;
     __gen_e_acsl_assert_data_6.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at_5,
                     & __gen_e_acsl_assert_data_6);
@@ -331,7 +331,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_7.pred_txt = "\\initialized(\\old(dest) + (0 .. \\old(n) - 1))";
     __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_7.fct = "strncpy";
-    __gen_e_acsl_assert_data_7.line = 438;
+    __gen_e_acsl_assert_data_7.line = 454;
     __gen_e_acsl_assert_data_7.name = "initialization";
     __e_acsl_assert(__gen_e_acsl_initialized_2,& __gen_e_acsl_assert_data_7);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
index da2c84457fb..c4a3ef8e49f 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
@@ -145,7 +145,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_2.pred_txt = "(\\let size = sizeof(char) * (((nmemb * size - 1) - 0) + 1);\n size <= 0? 0: size)\n<= 18446744073709551615";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_2.fct = "fread";
-    __gen_e_acsl_assert_data_2.line = 353;
+    __gen_e_acsl_assert_data_2.line = 390;
     __gen_e_acsl_assert_data_2.name = "offset_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le_2 <= 0,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -176,7 +176,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data.pred_txt = "\\valid((char *)ptr + (0 .. nmemb * size - 1))";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data.fct = "fread";
-    __gen_e_acsl_assert_data.line = 353;
+    __gen_e_acsl_assert_data.line = 390;
     __gen_e_acsl_assert_data.name = "valid_ptr_block";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -195,7 +195,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_3.pred_txt = "\\valid(stream)";
     __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_3.fct = "fread";
-    __gen_e_acsl_assert_data_3.line = 354;
+    __gen_e_acsl_assert_data_3.line = 391;
     __gen_e_acsl_assert_data_3.name = "valid_stream";
     __e_acsl_assert(__gen_e_acsl_valid_2,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -242,7 +242,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_4.pred_txt = "__retres * size <= 18446744073709551615";
     __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_4.fct = "fread";
-    __gen_e_acsl_assert_data_4.line = 352;
+    __gen_e_acsl_assert_data_4.line = 389;
     __gen_e_acsl_assert_data_4.name = "size_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le_3 <= 0,& __gen_e_acsl_assert_data_4);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -281,7 +281,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_5.pred_txt = "\\result <= \\old(nmemb)";
     __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_5.fct = "fread";
-    __gen_e_acsl_assert_data_5.line = 358;
+    __gen_e_acsl_assert_data_5.line = 395;
     __gen_e_acsl_assert_data_5.name = "size_read";
     __e_acsl_assert(__retres <= __gen_e_acsl_at_3,
                     & __gen_e_acsl_assert_data_5);
@@ -338,7 +338,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_7.pred_txt = "(\\let size = sizeof(char) * (((\\result * \\old(size) - 1) - 0) + 1);\n size <= 0? 0: size)\n<= 18446744073709551615";
     __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_7.fct = "fread";
-    __gen_e_acsl_assert_data_7.line = 359;
+    __gen_e_acsl_assert_data_7.line = 396;
     __gen_e_acsl_assert_data_7.name = "offset_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le_5 <= 0,& __gen_e_acsl_assert_data_7);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
@@ -372,7 +372,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_6.pred_txt = "\\initialized((char *)\\old(ptr) + (0 .. \\result * \\old(size) - 1))";
     __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_6.fct = "fread";
-    __gen_e_acsl_assert_data_6.line = 359;
+    __gen_e_acsl_assert_data_6.line = 396;
     __gen_e_acsl_assert_data_6.name = "initialization";
     __e_acsl_assert(__gen_e_acsl_initialized,& __gen_e_acsl_assert_data_6);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
@@ -440,7 +440,7 @@ int __gen_e_acsl_fclose(FILE *stream)
     __gen_e_acsl_assert_data.pred_txt = "\\valid(stream)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data.fct = "fclose";
-    __gen_e_acsl_assert_data.line = 120;
+    __gen_e_acsl_assert_data.line = 157;
     __gen_e_acsl_assert_data.name = "valid_stream";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -463,7 +463,7 @@ int __gen_e_acsl_fclose(FILE *stream)
     __gen_e_acsl_assert_data_2.pred_txt = "\\result == 0 || \\result == -1";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_2.fct = "fclose";
-    __gen_e_acsl_assert_data_2.line = 122;
+    __gen_e_acsl_assert_data_2.line = 159;
     __gen_e_acsl_assert_data_2.name = "result_zero_or_EOF";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-40.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-40.res.oracle
index 6fce00762a0..c27c86b60aa 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-40.res.oracle
+++ b/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-40.res.oracle
@@ -5,82 +5,82 @@
 [e-acsl] Warning: annotating undefined function `fopen':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:352: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:389: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:150: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:187: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:149: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:186: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:155: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:192: Warning: 
   E-ACSL construct
   `logic functions or predicates with no definition nor reads clause'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:118: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:155: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_mpz: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:354: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:391: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:354: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:391: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:354: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:391: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:352: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:389: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:352: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:389: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:358: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:395: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_mpz: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_mpz: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __gen_e_acsl_fread: postcondition 'initialization' got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:120: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:157: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:120: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:157: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:120: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:157: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:122: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:159: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
 [eva:alarm] issue-eacsl-40.c:31: Warning: 
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
index f92bbb706d3..e680081eeaa 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
@@ -649,7 +649,7 @@ pid_t __gen_e_acsl_fork(void)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result > 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "fork";
-    __gen_e_acsl_assert_data.line = 854;
+    __gen_e_acsl_assert_data.line = 883;
     __gen_e_acsl_assert_data.name = "result_ok_child_or_error";
     __e_acsl_assert(__gen_e_acsl_or_2,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
index 34b223989b6..8a2b12c2198 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
@@ -177,7 +177,7 @@ char *__gen_e_acsl_strdup(char const *s)
       __gen_e_acsl_assert_data_4.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
       __gen_e_acsl_assert_data_4.fct = "strdup";
-      __gen_e_acsl_assert_data_4.line = 580;
+      __gen_e_acsl_assert_data_4.line = 596;
       __gen_e_acsl_assert_data_4.name = "no_allocation/result_null";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -219,7 +219,7 @@ pid_t __gen_e_acsl_fork(void)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result > 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "fork";
-    __gen_e_acsl_assert_data.line = 854;
+    __gen_e_acsl_assert_data.line = 883;
     __gen_e_acsl_assert_data.name = "result_ok_child_or_error";
     __e_acsl_assert(__gen_e_acsl_or_2,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
index 12582f8bbbc..e06b0298943 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
@@ -590,7 +590,7 @@ char *__gen_e_acsl_strdup(char const *s)
       __gen_e_acsl_assert_data_4.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
       __gen_e_acsl_assert_data_4.fct = "strdup";
-      __gen_e_acsl_assert_data_4.line = 580;
+      __gen_e_acsl_assert_data_4.line = 596;
       __gen_e_acsl_assert_data_4.name = "no_allocation/result_null";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -632,7 +632,7 @@ pid_t __gen_e_acsl_fork(void)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result > 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "fork";
-    __gen_e_acsl_assert_data.line = 854;
+    __gen_e_acsl_assert_data.line = 883;
     __gen_e_acsl_assert_data.name = "result_ok_child_or_error";
     __e_acsl_assert(__gen_e_acsl_or_2,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
index 1ec8397bd9c..88b53519a2e 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
@@ -151,7 +151,7 @@ char *__gen_e_acsl_strdup(char const *s)
       __gen_e_acsl_assert_data_4.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
       __gen_e_acsl_assert_data_4.fct = "strdup";
-      __gen_e_acsl_assert_data_4.line = 580;
+      __gen_e_acsl_assert_data_4.line = 596;
       __gen_e_acsl_assert_data_4.name = "no_allocation/result_null";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -193,7 +193,7 @@ pid_t __gen_e_acsl_fork(void)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result > 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "fork";
-    __gen_e_acsl_assert_data.line = 854;
+    __gen_e_acsl_assert_data.line = 883;
     __gen_e_acsl_assert_data.name = "result_ok_child_or_error";
     __e_acsl_assert(__gen_e_acsl_or_2,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/strcat.res.oracle b/src/plugins/e-acsl/tests/builtin/oracle/strcat.res.oracle
index ece498629b5..36afb28f13f 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/strcat.res.oracle
+++ b/src/plugins/e-acsl/tests/builtin/oracle/strcat.res.oracle
@@ -8,7 +8,7 @@
 [e-acsl] Warning: annotating undefined function `fork':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:851: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:880: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/sys/wait.h:82: Warning: 
@@ -25,9 +25,9 @@
   is not yet supported.
   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:854: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:883: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:855: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:884: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/strcmp.res.oracle b/src/plugins/e-acsl/tests/builtin/oracle/strcmp.res.oracle
index 18154f6f621..5d7296f94de 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/strcmp.res.oracle
+++ b/src/plugins/e-acsl/tests/builtin/oracle/strcmp.res.oracle
@@ -16,37 +16,37 @@
 [e-acsl] Warning: annotating undefined function `strdup':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:565: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:581: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:569: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:585: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:577: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:593: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:573: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:589: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:575: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:591: Warning: 
   no assigns clause generated for function valid_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:274: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:851: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:880: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/sys/wait.h:82: Warning: 
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/strcpy.res.oracle b/src/plugins/e-acsl/tests/builtin/oracle/strcpy.res.oracle
index f52c455c798..5e172acf050 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/strcpy.res.oracle
+++ b/src/plugins/e-acsl/tests/builtin/oracle/strcpy.res.oracle
@@ -11,37 +11,37 @@
 [e-acsl] Warning: annotating undefined function `strdup':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:565: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:581: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:569: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:585: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:577: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:593: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:573: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:589: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:575: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:591: Warning: 
   no assigns clause generated for function valid_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:274: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:851: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:880: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/sys/wait.h:82: Warning: 
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/strlen.res.oracle b/src/plugins/e-acsl/tests/builtin/oracle/strlen.res.oracle
index 23c21e99648..72feae61b40 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/strlen.res.oracle
+++ b/src/plugins/e-acsl/tests/builtin/oracle/strlen.res.oracle
@@ -14,37 +14,37 @@
 [e-acsl] Warning: annotating undefined function `strdup':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:565: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:581: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:569: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:585: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:577: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:593: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:564: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:580: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:573: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:589: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:575: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:591: Warning: 
   no assigns clause generated for function valid_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:274: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:851: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:880: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/sys/wait.h:82: Warning: 
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
index 27f2d290b54..784c237943e 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
@@ -758,7 +758,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "usleep";
-    __gen_e_acsl_assert_data.line = 1153;
+    __gen_e_acsl_assert_data.line = 1182;
     __gen_e_acsl_assert_data.name = "result_ok_or_error";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -1729,7 +1729,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_full_init((void *)(& __fc_interrupted));
     __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
+    __e_acsl_store_block((void *)(& __fc_time_tm),56UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
     __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
index 6cd1e48d014..0b80c51ec11 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
@@ -468,7 +468,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_full_init((void *)(& __fc_interrupted));
     __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
+    __e_acsl_store_block((void *)(& __fc_time_tm),56UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
     __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
index 5b9c35ce05b..7c7773f0eb7 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
@@ -440,7 +440,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "usleep";
-    __gen_e_acsl_assert_data.line = 1153;
+    __gen_e_acsl_assert_data.line = 1182;
     __gen_e_acsl_assert_data.name = "result_ok_or_error";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -1411,7 +1411,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_full_init((void *)(& __fc_interrupted));
     __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
+    __e_acsl_store_block((void *)(& __fc_time_tm),56UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
     __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
index 945951d9514..b001ec6de1f 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
@@ -438,7 +438,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_full_init((void *)(& __fc_interrupted));
     __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
+    __e_acsl_store_block((void *)(& __fc_time_tm),56UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
     __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle b/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle
index 3d60921bd17..6d1f50b7917 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle
@@ -38,7 +38,7 @@
 [e-acsl] Warning: annotating undefined function `usleep':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:1150: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:1179: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/stdlib.h:539: Warning: 
@@ -51,13 +51,13 @@
   E-ACSL construct `abnormal termination case in behavior'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:486: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:523: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:485: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:522: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/pthread.h:498: Warning: 
@@ -181,6 +181,6 @@
 [eva:alarm] FRAMAC_SHARE/libc/pthread.h:502: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1153: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1182: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle b/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle
index 3d60921bd17..6d1f50b7917 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle
@@ -38,7 +38,7 @@
 [e-acsl] Warning: annotating undefined function `usleep':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:1150: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:1179: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/stdlib.h:539: Warning: 
@@ -51,13 +51,13 @@
   E-ACSL construct `abnormal termination case in behavior'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:486: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:523: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:485: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:522: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/pthread.h:498: Warning: 
@@ -181,6 +181,6 @@
 [eva:alarm] FRAMAC_SHARE/libc/pthread.h:502: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1153: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1182: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/format/oracle/fprintf.res.oracle b/src/plugins/e-acsl/tests/format/oracle/fprintf.res.oracle
index 0373a3bc7c8..cbc6c566a06 100644
--- a/src/plugins/e-acsl/tests/format/oracle/fprintf.res.oracle
+++ b/src/plugins/e-acsl/tests/format/oracle/fprintf.res.oracle
@@ -14,7 +14,7 @@
 [e-acsl] Warning: annotating undefined function `fork':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:851: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:880: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/sys/wait.h:82: Warning: 
@@ -30,21 +30,21 @@
   E-ACSL construct `abnormal termination case in behavior'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:118: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:155: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:94: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:131: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:97: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:134: Warning: 
   E-ACSL construct
   `logic functions or predicates with no definition nor reads clause'
   is not yet supported.
   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:854: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:883: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:855: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:884: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
index d9fae2605f6..c85a4fabfda 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
@@ -127,7 +127,7 @@ pid_t __gen_e_acsl_fork(void)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result > 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "fork";
-    __gen_e_acsl_assert_data.line = 854;
+    __gen_e_acsl_assert_data.line = 883;
     __gen_e_acsl_assert_data.name = "result_ok_child_or_error";
     __e_acsl_assert(__gen_e_acsl_or_2,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -307,7 +307,7 @@ int __gen_e_acsl_fclose(FILE *stream)
     __gen_e_acsl_assert_data.pred_txt = "\\valid(stream)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data.fct = "fclose";
-    __gen_e_acsl_assert_data.line = 120;
+    __gen_e_acsl_assert_data.line = 157;
     __gen_e_acsl_assert_data.name = "valid_stream";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -330,7 +330,7 @@ int __gen_e_acsl_fclose(FILE *stream)
     __gen_e_acsl_assert_data_2.pred_txt = "\\result == 0 || \\result == -1";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_2.fct = "fclose";
-    __gen_e_acsl_assert_data_2.line = 122;
+    __gen_e_acsl_assert_data_2.line = 159;
     __gen_e_acsl_assert_data_2.name = "result_zero_or_EOF";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
index 8558e51e17a..9589e2feac2 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
@@ -774,7 +774,7 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
     __gen_e_acsl_assert_data_6.pred_txt = "__gen_e_acsl_strcpy_src_size + 1 <= 18446744073709551615";
     __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_6.fct = "strcpy";
-    __gen_e_acsl_assert_data_6.line = 419;
+    __gen_e_acsl_assert_data_6.line = 435;
     __gen_e_acsl_assert_data_6.name = "size_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le <= 0,& __gen_e_acsl_assert_data_6);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
@@ -797,7 +797,7 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
     __gen_e_acsl_assert_data_8.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_8.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_8.fct = "strcpy";
-    __gen_e_acsl_assert_data_8.line = 426;
+    __gen_e_acsl_assert_data_8.line = 442;
     __gen_e_acsl_assert_data_8.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,& __gen_e_acsl_assert_data_8);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
@@ -885,7 +885,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
       __gen_e_acsl_assert_data_4.pred_txt = "\\valid_read(__retres)";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
       __gen_e_acsl_assert_data_4.fct = "strchr";
-      __gen_e_acsl_assert_data_4.line = 198;
+      __gen_e_acsl_assert_data_4.line = 214;
       __gen_e_acsl_assert_data_4.name = "mem_access";
       __e_acsl_assert(__gen_e_acsl_and,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -908,7 +908,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
       __gen_e_acsl_assert_data_5.pred_txt = "\\base_addr(\\result) == \\base_addr(\\old(s))";
       __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/string.h";
       __gen_e_acsl_assert_data_5.fct = "strchr";
-      __gen_e_acsl_assert_data_5.line = 199;
+      __gen_e_acsl_assert_data_5.line = 215;
       __gen_e_acsl_assert_data_5.name = "found/result_same_base";
       __e_acsl_assert(__gen_e_acsl_base_addr == __gen_e_acsl_base_addr_2,
                       & __gen_e_acsl_assert_data_5);
@@ -918,7 +918,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
       __gen_e_acsl_assert_data_3.pred_txt = "*\\result == (char)\\old(c)";
       __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/string.h";
       __gen_e_acsl_assert_data_3.fct = "strchr";
-      __gen_e_acsl_assert_data_3.line = 198;
+      __gen_e_acsl_assert_data_3.line = 214;
       __gen_e_acsl_assert_data_3.name = "found/result_char";
       __e_acsl_assert((int)*__retres == (int)((char)__gen_e_acsl_at_5),
                       & __gen_e_acsl_assert_data_3);
@@ -936,7 +936,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
       __gen_e_acsl_assert_data_8.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_8.file = "FRAMAC_SHARE/libc/string.h";
       __gen_e_acsl_assert_data_8.fct = "strchr";
-      __gen_e_acsl_assert_data_8.line = 205;
+      __gen_e_acsl_assert_data_8.line = 221;
       __gen_e_acsl_assert_data_8.name = "not_found/result_null";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_8);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
@@ -996,7 +996,7 @@ pid_t __gen_e_acsl_fork(void)
     __gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result > 0 || \\result == -1";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
     __gen_e_acsl_assert_data.fct = "fork";
-    __gen_e_acsl_assert_data.line = 854;
+    __gen_e_acsl_assert_data.line = 883;
     __gen_e_acsl_assert_data.name = "result_ok_child_or_error";
     __e_acsl_assert(__gen_e_acsl_or_2,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -3456,7 +3456,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_full_init((void *)(& valid_specifiers));
     __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
+    __e_acsl_store_block((void *)(& __fc_time_tm),56UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
   }
   return;
diff --git a/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle b/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle
index 61c1a73899c..29f09662353 100644
--- a/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle
+++ b/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle
@@ -20,64 +20,64 @@
 [e-acsl] Warning: annotating undefined function `strchr':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:419: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:435: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:420: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:436: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:422: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:438: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:422: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:438: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:419: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:435: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:425: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:441: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:196: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:212: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:204: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:220: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:192: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:208: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:192: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:208: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:200: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:216: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:202: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:218: Warning: 
   E-ACSL construct
   `non integer variable p in quantification
   found: result_first_occurrence:
     \forall char *p; \old(s) <= p < \result ==> *p != (char)\old(c)'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:158: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:174: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:160: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:176: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:851: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:880: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/sys/wait.h:82: Warning: 
@@ -104,9 +104,9 @@
   is not yet supported.
   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:854: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:883: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:855: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:884: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/libc/oracle/file.res.oracle b/src/plugins/e-acsl/tests/libc/oracle/file.res.oracle
index 91d25a8396e..60adf14d19a 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/file.res.oracle
+++ b/src/plugins/e-acsl/tests/libc/oracle/file.res.oracle
@@ -5,74 +5,74 @@
 [e-acsl] Warning: annotating undefined function `fopen':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:352: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:389: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:150: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:187: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:149: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:186: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:155: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:192: Warning: 
   E-ACSL construct
   `logic functions or predicates with no definition nor reads clause'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdio.h:118: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdio.h:155: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
 [eva:alarm] file.c:12: Warning: 
   function __gen_e_acsl_fread: precondition 'valid_stream' got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:353: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:390: Warning: 
   function __e_acsl_assert_register_mpz: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:354: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:391: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:354: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:391: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:354: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:391: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:352: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:389: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:352: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:389: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:358: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:395: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_mpz: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __e_acsl_assert_register_mpz: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:359: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:396: Warning: 
   function __gen_e_acsl_fread: postcondition 'initialization' got status unknown.
 [eva:alarm] file.c:13: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
@@ -153,14 +153,14 @@
                                                       \valid(data->values) got status unknown.
 [eva:alarm] file.c:39: Warning: 
   function __gen_e_acsl_fclose: precondition 'valid_stream' got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:120: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:157: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:120: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:157: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:120: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:157: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/stdio.h:122: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/stdio.h:159: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
index 667933a94db..493f7c643bb 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
@@ -145,7 +145,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_2.pred_txt = "(\\let size = sizeof(char) * (((nmemb * size - 1) - 0) + 1);\n size <= 0? 0: size)\n<= 18446744073709551615";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_2.fct = "fread";
-    __gen_e_acsl_assert_data_2.line = 353;
+    __gen_e_acsl_assert_data_2.line = 390;
     __gen_e_acsl_assert_data_2.name = "offset_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le_2 <= 0,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -176,7 +176,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data.pred_txt = "\\valid((char *)ptr + (0 .. nmemb * size - 1))";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data.fct = "fread";
-    __gen_e_acsl_assert_data.line = 353;
+    __gen_e_acsl_assert_data.line = 390;
     __gen_e_acsl_assert_data.name = "valid_ptr_block";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -195,7 +195,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_3.pred_txt = "\\valid(stream)";
     __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_3.fct = "fread";
-    __gen_e_acsl_assert_data_3.line = 354;
+    __gen_e_acsl_assert_data_3.line = 391;
     __gen_e_acsl_assert_data_3.name = "valid_stream";
     __e_acsl_assert(__gen_e_acsl_valid_2,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -242,7 +242,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_4.pred_txt = "__retres * size <= 18446744073709551615";
     __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_4.fct = "fread";
-    __gen_e_acsl_assert_data_4.line = 352;
+    __gen_e_acsl_assert_data_4.line = 389;
     __gen_e_acsl_assert_data_4.name = "size_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le_3 <= 0,& __gen_e_acsl_assert_data_4);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -281,7 +281,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_5.pred_txt = "\\result <= \\old(nmemb)";
     __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_5.fct = "fread";
-    __gen_e_acsl_assert_data_5.line = 358;
+    __gen_e_acsl_assert_data_5.line = 395;
     __gen_e_acsl_assert_data_5.name = "size_read";
     __e_acsl_assert(__retres <= __gen_e_acsl_at_3,
                     & __gen_e_acsl_assert_data_5);
@@ -338,7 +338,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_7.pred_txt = "(\\let size = sizeof(char) * (((\\result * \\old(size) - 1) - 0) + 1);\n size <= 0? 0: size)\n<= 18446744073709551615";
     __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_7.fct = "fread";
-    __gen_e_acsl_assert_data_7.line = 359;
+    __gen_e_acsl_assert_data_7.line = 396;
     __gen_e_acsl_assert_data_7.name = "offset_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le_5 <= 0,& __gen_e_acsl_assert_data_7);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
@@ -372,7 +372,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
     __gen_e_acsl_assert_data_6.pred_txt = "\\initialized((char *)\\old(ptr) + (0 .. \\result * \\old(size) - 1))";
     __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_6.fct = "fread";
-    __gen_e_acsl_assert_data_6.line = 359;
+    __gen_e_acsl_assert_data_6.line = 396;
     __gen_e_acsl_assert_data_6.name = "initialization";
     __e_acsl_assert(__gen_e_acsl_initialized,& __gen_e_acsl_assert_data_6);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
@@ -440,7 +440,7 @@ int __gen_e_acsl_fclose(FILE *stream)
     __gen_e_acsl_assert_data.pred_txt = "\\valid(stream)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data.fct = "fclose";
-    __gen_e_acsl_assert_data.line = 120;
+    __gen_e_acsl_assert_data.line = 157;
     __gen_e_acsl_assert_data.name = "valid_stream";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -463,7 +463,7 @@ int __gen_e_acsl_fclose(FILE *stream)
     __gen_e_acsl_assert_data_2.pred_txt = "\\result == 0 || \\result == -1";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdio.h";
     __gen_e_acsl_assert_data_2.fct = "fclose";
-    __gen_e_acsl_assert_data_2.line = 122;
+    __gen_e_acsl_assert_data_2.line = 159;
     __gen_e_acsl_assert_data_2.name = "result_zero_or_EOF";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
index 2080a3093e2..07067e6bf40 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
@@ -429,7 +429,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
     __gen_e_acsl_assert_data.pred_txt = "valid_or_empty(s, n)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data.fct = "memset";
-    __gen_e_acsl_assert_data.line = 148;
+    __gen_e_acsl_assert_data.line = 164;
     __gen_e_acsl_assert_data.name = "valid_s";
     __e_acsl_assert(__gen_e_acsl_valid_or_empty_here_2,
                     & __gen_e_acsl_assert_data);
@@ -449,7 +449,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
     __gen_e_acsl_assert_data_3.pred_txt = "\\result == \\old(s)";
     __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_3.fct = "memset";
-    __gen_e_acsl_assert_data_3.line = 152;
+    __gen_e_acsl_assert_data_3.line = 168;
     __gen_e_acsl_assert_data_3.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -493,7 +493,7 @@ void *__gen_e_acsl_memmove(void *dest, void const *src, size_t n)
     __gen_e_acsl_assert_data.pred_txt = "valid_or_empty(dest, n)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data.fct = "memmove";
-    __gen_e_acsl_assert_data.line = 137;
+    __gen_e_acsl_assert_data.line = 153;
     __gen_e_acsl_assert_data.name = "valid_dest";
     __e_acsl_assert(__gen_e_acsl_valid_or_empty_here_3,
                     & __gen_e_acsl_assert_data);
@@ -513,7 +513,7 @@ void *__gen_e_acsl_memmove(void *dest, void const *src, size_t n)
     __gen_e_acsl_assert_data_2.pred_txt = "valid_read_or_empty(src, n)";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_2.fct = "memmove";
-    __gen_e_acsl_assert_data_2.line = 138;
+    __gen_e_acsl_assert_data_2.line = 154;
     __gen_e_acsl_assert_data_2.name = "valid_src";
     __e_acsl_assert(__gen_e_acsl_valid_read_or_empty_here_2,
                     & __gen_e_acsl_assert_data_2);
@@ -533,7 +533,7 @@ void *__gen_e_acsl_memmove(void *dest, void const *src, size_t n)
     __gen_e_acsl_assert_data_5.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_5.fct = "memmove";
-    __gen_e_acsl_assert_data_5.line = 142;
+    __gen_e_acsl_assert_data_5.line = 158;
     __gen_e_acsl_assert_data_5.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,& __gen_e_acsl_assert_data_5);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
@@ -603,7 +603,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data.pred_txt = "valid_or_empty(dest, n)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data.fct = "memcpy";
-    __gen_e_acsl_assert_data.line = 112;
+    __gen_e_acsl_assert_data.line = 128;
     __gen_e_acsl_assert_data.name = "valid_dest";
     __e_acsl_assert(__gen_e_acsl_valid_or_empty_here_4,
                     & __gen_e_acsl_assert_data);
@@ -623,7 +623,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_2.pred_txt = "valid_read_or_empty(src, n)";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_2.fct = "memcpy";
-    __gen_e_acsl_assert_data_2.line = 113;
+    __gen_e_acsl_assert_data_2.line = 129;
     __gen_e_acsl_assert_data_2.name = "valid_src";
     __e_acsl_assert(__gen_e_acsl_valid_read_or_empty_here_3,
                     & __gen_e_acsl_assert_data_2);
@@ -670,7 +670,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_4.pred_txt = "\\valid_read((char *)dest + (0 .. n - 1))";
     __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_4.fct = "memcpy";
-    __gen_e_acsl_assert_data_4.line = 115;
+    __gen_e_acsl_assert_data_4.line = 131;
     __gen_e_acsl_assert_data_4.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read,& __gen_e_acsl_assert_data_4);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -701,7 +701,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_5.pred_txt = "\\valid_read((char *)src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_5.fct = "memcpy";
-    __gen_e_acsl_assert_data_5.line = 115;
+    __gen_e_acsl_assert_data_5.line = 131;
     __gen_e_acsl_assert_data_5.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read_2,& __gen_e_acsl_assert_data_5);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
@@ -746,7 +746,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_3.pred_txt = "\\separated((char *)dest + (0 .. n - 1), (char *)src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_3.fct = "memcpy";
-    __gen_e_acsl_assert_data_3.line = 115;
+    __gen_e_acsl_assert_data_3.line = 131;
     __gen_e_acsl_assert_data_3.name = "separation";
     __e_acsl_assert(__gen_e_acsl_separated,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -771,7 +771,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_7.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_7.fct = "memcpy";
-    __gen_e_acsl_assert_data_7.line = 119;
+    __gen_e_acsl_assert_data_7.line = 135;
     __gen_e_acsl_assert_data_7.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,& __gen_e_acsl_assert_data_7);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
index a4b1a052376..6ded675ced3 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
@@ -221,7 +221,7 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_8.pred_txt = "(__gen_e_acsl_strcat_src_size + __gen_e_acsl_strcat_dest_size) + 1 <=\n18446744073709551615";
     __gen_e_acsl_assert_data_8.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_8.fct = "strncat";
-    __gen_e_acsl_assert_data_8.line = 496;
+    __gen_e_acsl_assert_data_8.line = 512;
     __gen_e_acsl_assert_data_8.name = "size_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le <= 0,& __gen_e_acsl_assert_data_8);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
@@ -246,7 +246,7 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_9.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_9.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_9.fct = "strncat";
-    __gen_e_acsl_assert_data_9.line = 504;
+    __gen_e_acsl_assert_data_9.line = 520;
     __gen_e_acsl_assert_data_9.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at_3,
                     & __gen_e_acsl_assert_data_9);
@@ -339,7 +339,7 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src)
     __gen_e_acsl_assert_data_7.pred_txt = "(__gen_e_acsl_strcat_src_size + __gen_e_acsl_strcat_dest_size) + 1 <=\n18446744073709551615";
     __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_7.fct = "strcat";
-    __gen_e_acsl_assert_data_7.line = 475;
+    __gen_e_acsl_assert_data_7.line = 491;
     __gen_e_acsl_assert_data_7.name = "size_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le <= 0,& __gen_e_acsl_assert_data_7);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
@@ -364,7 +364,7 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src)
     __gen_e_acsl_assert_data_11.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_11.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_11.fct = "strcat";
-    __gen_e_acsl_assert_data_11.line = 488;
+    __gen_e_acsl_assert_data_11.line = 504;
     __gen_e_acsl_assert_data_11.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,
                     & __gen_e_acsl_assert_data_11);
@@ -483,7 +483,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_2.pred_txt = "\\valid(dest + (0 .. n - 1))";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_2.fct = "strncpy";
-    __gen_e_acsl_assert_data_2.line = 432;
+    __gen_e_acsl_assert_data_2.line = 448;
     __gen_e_acsl_assert_data_2.name = "room_nstring";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -515,7 +515,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_4.pred_txt = "\\valid_read(dest + (0 .. n - 1))";
     __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_4.fct = "strncpy";
-    __gen_e_acsl_assert_data_4.line = 434;
+    __gen_e_acsl_assert_data_4.line = 450;
     __gen_e_acsl_assert_data_4.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read,& __gen_e_acsl_assert_data_4);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -545,7 +545,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_5.pred_txt = "\\valid_read(src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_5.fct = "strncpy";
-    __gen_e_acsl_assert_data_5.line = 434;
+    __gen_e_acsl_assert_data_5.line = 450;
     __gen_e_acsl_assert_data_5.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read_2,& __gen_e_acsl_assert_data_5);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
@@ -591,7 +591,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_3.pred_txt = "\\separated(dest + (0 .. n - 1), src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_3.fct = "strncpy";
-    __gen_e_acsl_assert_data_3.line = 434;
+    __gen_e_acsl_assert_data_3.line = 450;
     __gen_e_acsl_assert_data_3.name = "separation";
     __e_acsl_assert(__gen_e_acsl_separated,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -626,7 +626,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_6.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_6.fct = "strncpy";
-    __gen_e_acsl_assert_data_6.line = 437;
+    __gen_e_acsl_assert_data_6.line = 453;
     __gen_e_acsl_assert_data_6.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at_5,
                     & __gen_e_acsl_assert_data_6);
@@ -674,7 +674,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
     __gen_e_acsl_assert_data_7.pred_txt = "\\initialized(\\old(dest) + (0 .. \\old(n) - 1))";
     __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_7.fct = "strncpy";
-    __gen_e_acsl_assert_data_7.line = 438;
+    __gen_e_acsl_assert_data_7.line = 454;
     __gen_e_acsl_assert_data_7.name = "initialization";
     __e_acsl_assert(__gen_e_acsl_initialized,& __gen_e_acsl_assert_data_7);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
@@ -744,7 +744,7 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
     __gen_e_acsl_assert_data_6.pred_txt = "__gen_e_acsl_strcpy_src_size + 1 <= 18446744073709551615";
     __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_6.fct = "strcpy";
-    __gen_e_acsl_assert_data_6.line = 419;
+    __gen_e_acsl_assert_data_6.line = 435;
     __gen_e_acsl_assert_data_6.name = "size_lesser_or_eq_than_SIZE_MAX";
     __e_acsl_assert(__gen_e_acsl_le <= 0,& __gen_e_acsl_assert_data_6);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
@@ -767,7 +767,7 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
     __gen_e_acsl_assert_data_8.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_8.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_8.fct = "strcpy";
-    __gen_e_acsl_assert_data_8.line = 426;
+    __gen_e_acsl_assert_data_8.line = 442;
     __gen_e_acsl_assert_data_8.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,& __gen_e_acsl_assert_data_8);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
diff --git a/src/plugins/e-acsl/tests/libc/oracle/mem.res.oracle b/src/plugins/e-acsl/tests/libc/oracle/mem.res.oracle
index 66d16674c03..77f31a87e78 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/mem.res.oracle
+++ b/src/plugins/e-acsl/tests/libc/oracle/mem.res.oracle
@@ -1,44 +1,44 @@
 [e-acsl] beginning translation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:164: Warning: 
   no assigns clause generated for function valid_or_empty because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/string.h:49: Warning: 
   no assigns clause generated for function empty_block because pointers as arguments is not yet supported
-[e-acsl] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:164: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:151: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:167: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:138: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:154: Warning: 
   no assigns clause generated for function valid_read_or_empty because pointers as arguments is not yet supported
-[e-acsl] FRAMAC_SHARE/libc/string.h:137: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:153: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:141: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:157: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:128: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:118: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:134: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
-[eva:alarm] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:164: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:164: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:164: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:152: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:168: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:151: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:167: Warning: 
   function __gen_e_acsl_memset: postcondition 'acsl_c_equiv' got status unknown.
 [eva:alarm] mem.c:10: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
@@ -79,45 +79,45 @@
 [eva:alarm] mem.c:19: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:128: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:128: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:128: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
 [eva:alarm] FRAMAC_SHARE/libc/string.h:52: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:113: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:129: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:113: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:129: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:113: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:129: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:119: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:135: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:118: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:134: Warning: 
   function __gen_e_acsl_memcpy: postcondition 'copied_contents' got status unknown.
 [eva:alarm] mem.c:23: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
@@ -134,26 +134,26 @@
 [eva:alarm] mem.c:25: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:137: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:153: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:137: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:153: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:137: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:153: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:138: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:154: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:138: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:154: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:138: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:154: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:142: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:158: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:141: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:157: Warning: 
   function __gen_e_acsl_memmove: postcondition 'copied_contents' got status unknown.
 [eva:alarm] mem.c:28: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
diff --git a/src/plugins/e-acsl/tests/libc/oracle/str.res.oracle b/src/plugins/e-acsl/tests/libc/oracle/str.res.oracle
index 63e75d6abc4..daf0d6c7456 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/str.res.oracle
+++ b/src/plugins/e-acsl/tests/libc/oracle/str.res.oracle
@@ -1,5 +1,5 @@
 [e-acsl] beginning translation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:497: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:513: Warning: 
   no assigns clause generated for function valid_read_nstring because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:281: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
@@ -7,110 +7,110 @@
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:498: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:514: Warning: 
   no assigns clause generated for function valid_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:274: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:500: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:516: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:501: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:517: Warning: 
   no assigns clause generated for function strnlen because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:300: Warning: 
   E-ACSL construct
   `logic functions or predicates with no definition nor reads clause'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:507: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:523: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:514: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:530: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:496: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:512: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:496: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:512: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:511: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:527: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:518: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:534: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:478: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:494: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:480: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:496: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:480: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:496: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:475: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:491: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:483: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:499: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:486: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:502: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:487: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:503: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:440: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:456: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:443: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:459: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:430: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:446: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:430: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:446: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:441: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:457: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:444: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:460: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:420: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:436: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:422: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:438: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:422: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:438: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:419: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:435: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:425: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:441: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
@@ -121,12 +121,12 @@
 [eva:alarm] str.c:13: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:419: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:435: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:426: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:442: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:425: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:441: Warning: 
   function __gen_e_acsl_strcpy: postcondition 'equal_contents' got status unknown.
 [eva:alarm] str.c:16: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c b/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
index 74ca57c7485..43fc0ff532e 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
@@ -209,7 +209,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
     __gen_e_acsl_assert_data_2.pred_txt = "resolved_name == \\null || \\valid(resolved_name + (0 .. 4096 - 1))";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdlib.h";
     __gen_e_acsl_assert_data_2.fct = "realpath";
-    __gen_e_acsl_assert_data_2.line = 846;
+    __gen_e_acsl_assert_data_2.line = 883;
     __gen_e_acsl_assert_data_2.name = "resolved_name_null_or_allocated";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -235,7 +235,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_4.pred_txt = "__fc_errno == 22";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_4.fct = "realpath";
-      __gen_e_acsl_assert_data_4.line = 857;
+      __gen_e_acsl_assert_data_4.line = 894;
       __gen_e_acsl_assert_data_4.name = "null_file_name/errno_set";
       __e_acsl_assert(errno == 22,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -244,7 +244,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_3.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_3.fct = "realpath";
-      __gen_e_acsl_assert_data_3.line = 856;
+      __gen_e_acsl_assert_data_3.line = 893;
       __gen_e_acsl_assert_data_3.name = "null_file_name/null_result";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_3);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -265,7 +265,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_7.pred_txt = "__fc_errno == 12";
       __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_7.fct = "realpath";
-      __gen_e_acsl_assert_data_7.line = 872;
+      __gen_e_acsl_assert_data_7.line = 909;
       __gen_e_acsl_assert_data_7.name = "not_enough_memory/errno_set";
       __e_acsl_assert(errno == 12,& __gen_e_acsl_assert_data_7);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
@@ -274,7 +274,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_6.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_6.fct = "realpath";
-      __gen_e_acsl_assert_data_6.line = 871;
+      __gen_e_acsl_assert_data_6.line = 908;
       __gen_e_acsl_assert_data_6.name = "not_enough_memory/null_result";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_6);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
@@ -294,7 +294,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_9.pred_txt = "\\result == \\old(resolved_name)";
       __gen_e_acsl_assert_data_9.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_9.fct = "realpath";
-      __gen_e_acsl_assert_data_9.line = 884;
+      __gen_e_acsl_assert_data_9.line = 921;
       __gen_e_acsl_assert_data_9.name = "resolved_name_buffer/resolved_result";
       __e_acsl_assert(__retres == __gen_e_acsl_at,
                       & __gen_e_acsl_assert_data_9);
@@ -312,7 +312,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_10.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_10.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_10.fct = "realpath";
-      __gen_e_acsl_assert_data_10.line = 890;
+      __gen_e_acsl_assert_data_10.line = 927;
       __gen_e_acsl_assert_data_10.name = "filesystem_error/null_result";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_10);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
index 1592b8cdd10..647005b31ba 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
@@ -420,7 +420,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
     __gen_e_acsl_assert_data.pred_txt = "\\valid(memptr)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/stdlib.h";
     __gen_e_acsl_assert_data.fct = "posix_memalign";
-    __gen_e_acsl_assert_data.line = 789;
+    __gen_e_acsl_assert_data.line = 799;
     __gen_e_acsl_assert_data.name = "valid_memptr";
     __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -463,7 +463,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
     __gen_e_acsl_assert_data_2.pred_txt = "alignment >= sizeof(void *) &&\n((size_t)alignment & (size_t)alignment - 1) == 0";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdlib.h";
     __gen_e_acsl_assert_data_2.fct = "posix_memalign";
-    __gen_e_acsl_assert_data_2.line = 791;
+    __gen_e_acsl_assert_data_2.line = 801;
     __gen_e_acsl_assert_data_2.name = "alignment_is_a_suitable_power_of_two";
     __e_acsl_assert(__gen_e_acsl_and,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -483,7 +483,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
       __gen_e_acsl_assert_data_4.pred_txt = "\\result == 0";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_4.fct = "posix_memalign";
-      __gen_e_acsl_assert_data_4.line = 803;
+      __gen_e_acsl_assert_data_4.line = 813;
       __gen_e_acsl_assert_data_4.name = "allocation/result_zero";
       __e_acsl_assert(__retres == 0,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -507,7 +507,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
       __gen_e_acsl_assert_data_5.pred_txt = "\\result < 0 || \\result > 0";
       __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_5.fct = "posix_memalign";
-      __gen_e_acsl_assert_data_5.line = 808;
+      __gen_e_acsl_assert_data_5.line = 818;
       __gen_e_acsl_assert_data_5.name = "no_allocation/result_non_zero";
       __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data_5);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
index f00ba949c50..e429c090901 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
@@ -85,7 +85,7 @@ time_t __gen_e_acsl_time(time_t *timer)
       __gen_e_acsl_assert_data.pred_txt = "\\valid(timer)";
       __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/time.h";
       __gen_e_acsl_assert_data.fct = "time";
-      __gen_e_acsl_assert_data.line = 120;
+      __gen_e_acsl_assert_data.line = 123;
       __gen_e_acsl_assert_data.name = "not_null/valid_timer";
       __e_acsl_assert(__gen_e_acsl_valid,& __gen_e_acsl_assert_data);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -102,7 +102,7 @@ time_t __gen_e_acsl_time(time_t *timer)
       __gen_e_acsl_assert_data_2.pred_txt = "all behaviors complete";
       __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/time.h";
       __gen_e_acsl_assert_data_2.fct = "time";
-      __gen_e_acsl_assert_data_2.line = 113;
+      __gen_e_acsl_assert_data_2.line = 116;
       __e_acsl_assert(__gen_e_acsl_active_bhvrs >= 1,
                       & __gen_e_acsl_assert_data_2);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -111,7 +111,7 @@ time_t __gen_e_acsl_time(time_t *timer)
       __gen_e_acsl_assert_data_3.pred_txt = "all behaviors disjoint";
       __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/time.h";
       __gen_e_acsl_assert_data_3.fct = "time";
-      __gen_e_acsl_assert_data_3.line = 113;
+      __gen_e_acsl_assert_data_3.line = 116;
       __e_acsl_assert(__gen_e_acsl_active_bhvrs <= 1,
                       & __gen_e_acsl_assert_data_3);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -140,7 +140,7 @@ time_t __gen_e_acsl_time(time_t *timer)
       __gen_e_acsl_assert_data_4.pred_txt = "\\initialized(\\old(timer))";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/time.h";
       __gen_e_acsl_assert_data_4.fct = "time";
-      __gen_e_acsl_assert_data_4.line = 122;
+      __gen_e_acsl_assert_data_4.line = 125;
       __gen_e_acsl_assert_data_4.name = "not_null/initialization/timer";
       __e_acsl_assert(__gen_e_acsl_initialized,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -161,7 +161,7 @@ void __e_acsl_globals_init(void)
     __e_acsl_full_init((void *)(& __fc_interrupted));
     __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
     __e_acsl_full_init((void *)(& __fc_p_time_tm));
-    __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
+    __e_acsl_store_block((void *)(& __fc_time_tm),56UL);
     __e_acsl_full_init((void *)(& __fc_time_tm));
     __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
     __e_acsl_full_init((void *)(& __fc_p_ctime));
diff --git a/src/plugins/e-acsl/tests/memory/oracle/hidden_malloc.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/hidden_malloc.res.oracle
index e018ddbb511..78e55664d30 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/hidden_malloc.res.oracle
+++ b/src/plugins/e-acsl/tests/memory/oracle/hidden_malloc.res.oracle
@@ -2,29 +2,29 @@
 [e-acsl] Warning: annotating undefined function `realpath':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:842: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:879: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:844: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:881: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:842: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:879: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:842: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:879: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:864: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:901: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:880: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:917: Warning: 
   no assigns clause generated for function valid_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:274: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:892: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:929: Warning: 
   E-ACSL construct
   `logic functions or predicates with no definition nor reads clause'
   is not yet supported.
diff --git a/src/plugins/e-acsl/tests/memory/oracle/mainargs.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/mainargs.res.oracle
index 23d24e3095e..d26b8d1554a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/mainargs.res.oracle
+++ b/src/plugins/e-acsl/tests/memory/oracle/mainargs.res.oracle
@@ -2,16 +2,16 @@
 [e-acsl] Warning: annotating undefined function `strlen':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/string.h:158: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:174: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:158: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:174: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:160: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:176: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
@@ -82,9 +82,9 @@
 [eva:alarm] mainargs.c:16: Warning: assertion got status unknown.
 [eva:alarm] mainargs.c:18: Warning: 
   function __gen_e_acsl_strlen: precondition 'valid_string_s' got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:158: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:174: Warning: 
   function strlen: precondition 'valid_string_s' got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:160: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:176: Warning: 
   function __gen_e_acsl_strlen: postcondition 'acsl_c_equiv' got status unknown.
 [eva:alarm] mainargs.c:19: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
diff --git a/src/plugins/e-acsl/tests/memory/oracle/memalign.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/memalign.res.oracle
index e572e7941c4..91546b71006 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/memalign.res.oracle
+++ b/src/plugins/e-acsl/tests/memory/oracle/memalign.res.oracle
@@ -2,22 +2,22 @@
 [e-acsl] Warning: annotating undefined function `posix_memalign':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:788: Warning: 
-  E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
 [e-acsl] FRAMAC_SHARE/libc/stdlib.h:798: Warning: 
+  E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:808: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:805: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:815: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:788: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:798: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:788: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:798: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:802: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:812: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
diff --git a/src/plugins/e-acsl/tests/memory/oracle/vdso.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/vdso.res.oracle
index e19fe1f52be..9626955990b 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/vdso.res.oracle
+++ b/src/plugins/e-acsl/tests/memory/oracle/vdso.res.oracle
@@ -2,7 +2,7 @@
 [e-acsl] Warning: annotating undefined function `time':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/time.h:113: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/time.h:116: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
 [e-acsl] translation done in project "e-acsl".
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
index 88e6322dd66..117129b66fc 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
@@ -211,7 +211,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
     __gen_e_acsl_assert_data_2.pred_txt = "resolved_name == \\null || \\valid(resolved_name + (0 .. 4096 - 1))";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/stdlib.h";
     __gen_e_acsl_assert_data_2.fct = "realpath";
-    __gen_e_acsl_assert_data_2.line = 846;
+    __gen_e_acsl_assert_data_2.line = 883;
     __gen_e_acsl_assert_data_2.name = "resolved_name_null_or_allocated";
     __e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data_2);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
@@ -242,7 +242,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_4.pred_txt = "__fc_errno == 22";
       __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_4.fct = "realpath";
-      __gen_e_acsl_assert_data_4.line = 857;
+      __gen_e_acsl_assert_data_4.line = 894;
       __gen_e_acsl_assert_data_4.name = "null_file_name/errno_set";
       __e_acsl_assert(errno == 22,& __gen_e_acsl_assert_data_4);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -251,7 +251,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_3.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_3.fct = "realpath";
-      __gen_e_acsl_assert_data_3.line = 856;
+      __gen_e_acsl_assert_data_3.line = 893;
       __gen_e_acsl_assert_data_3.name = "null_file_name/null_result";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_3);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -272,7 +272,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_7.pred_txt = "__fc_errno == 12";
       __gen_e_acsl_assert_data_7.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_7.fct = "realpath";
-      __gen_e_acsl_assert_data_7.line = 872;
+      __gen_e_acsl_assert_data_7.line = 909;
       __gen_e_acsl_assert_data_7.name = "not_enough_memory/errno_set";
       __e_acsl_assert(errno == 12,& __gen_e_acsl_assert_data_7);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
@@ -281,7 +281,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_6.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_6.fct = "realpath";
-      __gen_e_acsl_assert_data_6.line = 871;
+      __gen_e_acsl_assert_data_6.line = 908;
       __gen_e_acsl_assert_data_6.name = "not_enough_memory/null_result";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_6);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
@@ -301,7 +301,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_9.pred_txt = "\\result == \\old(resolved_name)";
       __gen_e_acsl_assert_data_9.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_9.fct = "realpath";
-      __gen_e_acsl_assert_data_9.line = 884;
+      __gen_e_acsl_assert_data_9.line = 921;
       __gen_e_acsl_assert_data_9.name = "resolved_name_buffer/resolved_result";
       __e_acsl_assert(__retres == __gen_e_acsl_at,
                       & __gen_e_acsl_assert_data_9);
@@ -319,7 +319,7 @@ char *__gen_e_acsl_realpath(char const * restrict file_name,
       __gen_e_acsl_assert_data_10.pred_txt = "\\result == \\null";
       __gen_e_acsl_assert_data_10.file = "FRAMAC_SHARE/libc/stdlib.h";
       __gen_e_acsl_assert_data_10.fct = "realpath";
-      __gen_e_acsl_assert_data_10.line = 890;
+      __gen_e_acsl_assert_data_10.line = 927;
       __gen_e_acsl_assert_data_10.name = "filesystem_error/null_result";
       __e_acsl_assert(__retres == (char *)0,& __gen_e_acsl_assert_data_10);
       __e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
index b801bccbed3..a01519a9de9 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
@@ -765,7 +765,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
     __gen_e_acsl_assert_data.pred_txt = "valid_or_empty(s, n)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data.fct = "memset";
-    __gen_e_acsl_assert_data.line = 148;
+    __gen_e_acsl_assert_data.line = 164;
     __gen_e_acsl_assert_data.name = "valid_s";
     __e_acsl_assert(__gen_e_acsl_valid_or_empty_here_2,
                     & __gen_e_acsl_assert_data);
@@ -789,7 +789,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
     __gen_e_acsl_assert_data_3.pred_txt = "\\result == \\old(s)";
     __gen_e_acsl_assert_data_3.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_3.fct = "memset";
-    __gen_e_acsl_assert_data_3.line = 152;
+    __gen_e_acsl_assert_data_3.line = 168;
     __gen_e_acsl_assert_data_3.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,& __gen_e_acsl_assert_data_3);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
@@ -860,7 +860,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data.pred_txt = "valid_or_empty(dest, n)";
     __gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data.fct = "memcpy";
-    __gen_e_acsl_assert_data.line = 112;
+    __gen_e_acsl_assert_data.line = 128;
     __gen_e_acsl_assert_data.name = "valid_dest";
     __e_acsl_assert(__gen_e_acsl_valid_or_empty_here_3,
                     & __gen_e_acsl_assert_data);
@@ -880,7 +880,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_2.pred_txt = "valid_read_or_empty(src, n)";
     __gen_e_acsl_assert_data_2.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_2.fct = "memcpy";
-    __gen_e_acsl_assert_data_2.line = 113;
+    __gen_e_acsl_assert_data_2.line = 129;
     __gen_e_acsl_assert_data_2.name = "valid_src";
     __e_acsl_assert(__gen_e_acsl_valid_read_or_empty_here_2,
                     & __gen_e_acsl_assert_data_2);
@@ -927,7 +927,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_5.pred_txt = "\\valid_read((char *)dest + (0 .. n - 1))";
     __gen_e_acsl_assert_data_5.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_5.fct = "memcpy";
-    __gen_e_acsl_assert_data_5.line = 115;
+    __gen_e_acsl_assert_data_5.line = 131;
     __gen_e_acsl_assert_data_5.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read_3,& __gen_e_acsl_assert_data_5);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
@@ -958,7 +958,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_6.pred_txt = "\\valid_read((char *)src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_6.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_6.fct = "memcpy";
-    __gen_e_acsl_assert_data_6.line = 115;
+    __gen_e_acsl_assert_data_6.line = 131;
     __gen_e_acsl_assert_data_6.name = "separated_guard";
     __e_acsl_assert(__gen_e_acsl_valid_read_4,& __gen_e_acsl_assert_data_6);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
@@ -1003,7 +1003,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_4.pred_txt = "\\separated((char *)dest + (0 .. n - 1), (char *)src + (0 .. n - 1))";
     __gen_e_acsl_assert_data_4.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_4.fct = "memcpy";
-    __gen_e_acsl_assert_data_4.line = 115;
+    __gen_e_acsl_assert_data_4.line = 131;
     __gen_e_acsl_assert_data_4.name = "separation";
     __e_acsl_assert(__gen_e_acsl_separated,& __gen_e_acsl_assert_data_4);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
@@ -1033,7 +1033,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
     __gen_e_acsl_assert_data_8.pred_txt = "\\result == \\old(dest)";
     __gen_e_acsl_assert_data_8.file = "FRAMAC_SHARE/libc/string.h";
     __gen_e_acsl_assert_data_8.fct = "memcpy";
-    __gen_e_acsl_assert_data_8.line = 119;
+    __gen_e_acsl_assert_data_8.line = 135;
     __gen_e_acsl_assert_data_8.name = "result_ptr";
     __e_acsl_assert(__retres == __gen_e_acsl_at,& __gen_e_acsl_assert_data_8);
     __e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/t_fun_lib.res.oracle b/src/plugins/e-acsl/tests/temporal/oracle/t_fun_lib.res.oracle
index ffd8eb30897..12d8183e537 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/t_fun_lib.res.oracle
+++ b/src/plugins/e-acsl/tests/temporal/oracle/t_fun_lib.res.oracle
@@ -2,29 +2,29 @@
 [e-acsl] Warning: annotating undefined function `realpath':
   the generated program may miss memory instrumentation
   if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:842: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:879: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:844: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:881: Warning: 
   no assigns clause generated for function valid_read_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:277: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:842: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:879: Warning: 
   Some assumes clauses could not be translated.
   Ignoring complete and disjoint behaviors annotations.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:842: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:879: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:864: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:901: Warning: 
   E-ACSL construct `\fresh' is not yet supported. Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:880: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:917: Warning: 
   no assigns clause generated for function valid_string because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:274: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/stdlib.h:892: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/stdlib.h:929: Warning: 
   E-ACSL construct
   `logic functions or predicates with no definition nor reads clause'
   is not yet supported.
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/t_memcpy.res.oracle b/src/plugins/e-acsl/tests/temporal/oracle/t_memcpy.res.oracle
index 4e14e33da38..d48bb831cc7 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/t_memcpy.res.oracle
+++ b/src/plugins/e-acsl/tests/temporal/oracle/t_memcpy.res.oracle
@@ -1,21 +1,21 @@
 [e-acsl] beginning translation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:164: Warning: 
   no assigns clause generated for function valid_or_empty because pointers as arguments is not yet supported
 [e-acsl] FRAMAC_SHARE/libc/string.h:49: Warning: 
   no assigns clause generated for function empty_block because pointers as arguments is not yet supported
-[e-acsl] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:164: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:151: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:167: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:113: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:129: Warning: 
   no assigns clause generated for function valid_read_or_empty because pointers as arguments is not yet supported
-[e-acsl] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:128: Warning: 
   E-ACSL construct `assigns clause in behavior' is not yet supported.
   Ignoring annotation.
-[e-acsl] FRAMAC_SHARE/libc/string.h:118: Warning: 
+[e-acsl] FRAMAC_SHARE/libc/string.h:134: Warning: 
   E-ACSL construct `logic functions or predicates performing read accesses'
   is not yet supported.
   Ignoring annotation.
@@ -44,45 +44,45 @@
 [eva:alarm] t_memcpy.c:21: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:128: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:128: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:112: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:128: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
 [eva:alarm] FRAMAC_SHARE/libc/string.h:52: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:113: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:129: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:113: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:129: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:113: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:129: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:115: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:119: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:135: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:118: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:134: Warning: 
   function __gen_e_acsl_memcpy: postcondition 'copied_contents' got status unknown.
 [eva:alarm] t_memcpy.c:25: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
@@ -108,18 +108,18 @@
 [eva:alarm] t_memcpy.c:26: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
                                                         \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:164: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:164: Warning: 
   function __e_acsl_assert_register_int: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:148: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:164: Warning: 
   function __e_acsl_assert, behavior blocking: precondition got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:152: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:168: Warning: 
   function __e_acsl_assert_register_ptr: precondition data->values == \null ||
                                                       \valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/string.h:151: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:167: Warning: 
   function __gen_e_acsl_memset: postcondition 'acsl_c_equiv' got status unknown.
 [eva:alarm] t_memcpy.c:30: Warning: 
   function __e_acsl_assert_register_ulong: precondition data->values == \null ||
diff --git a/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle b/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
index 2b4cbb58cf0..f8fc6e591f5 100644
--- a/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
+++ b/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
@@ -4,7 +4,7 @@
   
 [eva] cwe126.c:77: allocating variable __malloc_goodG2B_l77
 [eva] using specification for function exit
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] cwe126.c:63: starting to merge loop iterations
 [eva] cwe126.c:41: 
diff --git a/src/plugins/nonterm/tests/nonterm/oracle/builtin_with_body.res.oracle b/src/plugins/nonterm/tests/nonterm/oracle/builtin_with_body.res.oracle
index e0fb8cec55c..7e911da370b 100644
--- a/src/plugins/nonterm/tests/nonterm/oracle/builtin_with_body.res.oracle
+++ b/src/plugins/nonterm/tests/nonterm/oracle/builtin_with_body.res.oracle
@@ -11,7 +11,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] builtin_with_body.c:13: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/src/plugins/nonterm/tests/nonterm/oracle/n6.res.oracle b/src/plugins/nonterm/tests/nonterm/oracle/n6.res.oracle
index dfee7778a15..576bdf214b7 100644
--- a/src/plugins/nonterm/tests/nonterm/oracle/n6.res.oracle
+++ b/src/plugins/nonterm/tests/nonterm/oracle/n6.res.oracle
@@ -8,7 +8,7 @@
 [eva] n6.c:9: function memcpy: precondition 'valid_dest' got status valid.
 [eva] n6.c:9: function memcpy: precondition 'valid_src' got status valid.
 [eva] n6.c:9: function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/src/plugins/variadic/tests/erroneous/oracle/exec.res.oracle b/src/plugins/variadic/tests/erroneous/oracle/exec.res.oracle
index c490429033d..a91adea5808 100644
--- a/src/plugins/variadic/tests/erroneous/oracle/exec.res.oracle
+++ b/src/plugins/variadic/tests/erroneous/oracle/exec.res.oracle
@@ -1,8 +1,13 @@
-[variadic] FRAMAC_SHARE/libc/unistd.h:807: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:115: 
+  Declaration of variadic function fcntl.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:118: Declaration of variadic function open.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:125: 
+  Declaration of variadic function openat.
+[variadic] FRAMAC_SHARE/libc/unistd.h:836: 
   Declaration of variadic function execl.
-[variadic] FRAMAC_SHARE/libc/unistd.h:812: 
+[variadic] FRAMAC_SHARE/libc/unistd.h:841: 
   Declaration of variadic function execle.
-[variadic] FRAMAC_SHARE/libc/unistd.h:817: 
+[variadic] FRAMAC_SHARE/libc/unistd.h:846: 
   Declaration of variadic function execlp.
 [variadic:typing] exec.c:5: Warning: 
   Incorrect type for argument 3. The argument will be cast from int to char *.
diff --git a/src/plugins/variadic/tests/erroneous/oracle/printf.res.oracle b/src/plugins/variadic/tests/erroneous/oracle/printf.res.oracle
index 709eade7c32..d2d3fe8af62 100644
--- a/src/plugins/variadic/tests/erroneous/oracle/printf.res.oracle
+++ b/src/plugins/variadic/tests/erroneous/oracle/printf.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic:libc:format] printf.c:8: Warning: Multiple usage of flag '-'.
 [variadic:libc:format] printf.c:8: Warning: 
diff --git a/src/plugins/variadic/tests/known/oracle/exec.res.oracle b/src/plugins/variadic/tests/known/oracle/exec.res.oracle
index 335dfe32f04..03338e671a1 100644
--- a/src/plugins/variadic/tests/known/oracle/exec.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/exec.res.oracle
@@ -1,8 +1,13 @@
-[variadic] FRAMAC_SHARE/libc/unistd.h:807: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:115: 
+  Declaration of variadic function fcntl.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:118: Declaration of variadic function open.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:125: 
+  Declaration of variadic function openat.
+[variadic] FRAMAC_SHARE/libc/unistd.h:836: 
   Declaration of variadic function execl.
-[variadic] FRAMAC_SHARE/libc/unistd.h:812: 
+[variadic] FRAMAC_SHARE/libc/unistd.h:841: 
   Declaration of variadic function execle.
-[variadic] FRAMAC_SHARE/libc/unistd.h:817: 
+[variadic] FRAMAC_SHARE/libc/unistd.h:846: 
   Declaration of variadic function execlp.
 [variadic] exec.c:9: Translating call to execle to a call to execve.
 [variadic:typing] exec.c:11: Warning: 
@@ -48,6 +53,7 @@
   sentinel ∈ {0}
   __retres ∈ {0}
 /* Generated by Frama-C */
+#include "fcntl.h"
 #include "unistd.h"
 /*@ assigns \result, *(param1 + (0 ..));
     assigns \result
diff --git a/src/plugins/variadic/tests/known/oracle/exec_failed_requirement.res.oracle b/src/plugins/variadic/tests/known/oracle/exec_failed_requirement.res.oracle
index 1191d47e98d..75b3ce8cf27 100644
--- a/src/plugins/variadic/tests/known/oracle/exec_failed_requirement.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/exec_failed_requirement.res.oracle
@@ -1,8 +1,13 @@
-[variadic] FRAMAC_SHARE/libc/unistd.h:807: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:115: 
+  Declaration of variadic function fcntl.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:118: Declaration of variadic function open.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:125: 
+  Declaration of variadic function openat.
+[variadic] FRAMAC_SHARE/libc/unistd.h:836: 
   Declaration of variadic function execl.
-[variadic] FRAMAC_SHARE/libc/unistd.h:812: 
+[variadic] FRAMAC_SHARE/libc/unistd.h:841: 
   Declaration of variadic function execle.
-[variadic] FRAMAC_SHARE/libc/unistd.h:817: 
+[variadic] FRAMAC_SHARE/libc/unistd.h:846: 
   Declaration of variadic function execlp.
 [variadic] exec_failed_requirement.c:7: 
   Translating call to execl to a call to execv.
@@ -14,6 +19,7 @@
 [eva:final-states] Values at end of function main:
   NON TERMINATING FUNCTION
 /* Generated by Frama-C */
+#include "fcntl.h"
 #include "unistd.h"
 int main(void)
 {
diff --git a/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle b/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle
index da138c294e8..b15b13096bc 100644
--- a/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle
@@ -1,7 +1,7 @@
-[variadic] FRAMAC_SHARE/libc/fcntl.h:128: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:115: 
   Declaration of variadic function fcntl.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:131: Declaration of variadic function open.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:138: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:118: Declaration of variadic function open.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:125: 
   Declaration of variadic function openat.
 [variadic] fcntl.c:8: 
   Translating call to the specialized version fcntl(int, int).
diff --git a/src/plugins/variadic/tests/known/oracle/open.res.oracle b/src/plugins/variadic/tests/known/oracle/open.res.oracle
index fd420fb5cef..ec407450fca 100644
--- a/src/plugins/variadic/tests/known/oracle/open.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/open.res.oracle
@@ -1,7 +1,7 @@
-[variadic] FRAMAC_SHARE/libc/fcntl.h:128: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:115: 
   Declaration of variadic function fcntl.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:131: Declaration of variadic function open.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:138: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:118: Declaration of variadic function open.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:125: 
   Declaration of variadic function openat.
 [variadic] open.c:7: 
   Translating call to the specialized version open(char const *, int, mode_t).
diff --git a/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle b/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle
index 6550a1739aa..ae94f9c59c8 100644
--- a/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle
@@ -1,7 +1,7 @@
-[variadic] FRAMAC_SHARE/libc/fcntl.h:128: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:115: 
   Declaration of variadic function fcntl.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:131: Declaration of variadic function open.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:138: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:118: Declaration of variadic function open.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:125: 
   Declaration of variadic function openat.
 [variadic:prototype] open_wrong.c:13: Warning: 
   No matching prototype found for this call to open.
diff --git a/src/plugins/variadic/tests/known/oracle/openat.res.oracle b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
index b7ac263ec20..e45e5dc8e07 100644
--- a/src/plugins/variadic/tests/known/oracle/openat.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
@@ -1,7 +1,7 @@
-[variadic] FRAMAC_SHARE/libc/fcntl.h:128: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:115: 
   Declaration of variadic function fcntl.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:131: Declaration of variadic function open.
-[variadic] FRAMAC_SHARE/libc/fcntl.h:138: 
+[variadic] FRAMAC_SHARE/libc/fcntl.h:118: Declaration of variadic function open.
+[variadic] FRAMAC_SHARE/libc/fcntl.h:125: 
   Declaration of variadic function openat.
 [variadic] openat.c:8: 
   Translating call to the specialized version openat(int, char const *, int, mode_t).
diff --git a/src/plugins/variadic/tests/known/oracle/printf.res.oracle b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
index 3114385ff21..a567cee9c48 100644
--- a/src/plugins/variadic/tests/known/oracle/printf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
@@ -1,32 +1,32 @@
-[variadic] FRAMAC_SHARE/libc/wchar.h:295: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:309: 
   Declaration of variadic function fwprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:297: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:311: 
   Declaration of variadic function swprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:299: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:313: 
   Declaration of variadic function wprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:302: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:316: 
   Declaration of variadic function wscanf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:304: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:318: 
   Declaration of variadic function fwscanf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:306: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:320: 
   Declaration of variadic function swscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] printf.c:37: 
   Translating call to printf to a call to the specialized version printf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
index bf20a0b88db..445fabe655d 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] printf_garbled_mix.c:7: 
   Translating call to printf to a call to the specialized version printf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle
index 99fb9022062..ea0427acf1a 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] printf_wrong_arity.c:8: 
   Translating call to printf to a call to the specialized version printf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
index 54371469ecb..d2d9c9511ab 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] printf_wrong_pointers.c:14: 
   Translating call to printf to a call to the specialized version printf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
index 24ae14ef3ed..3e2d7c84620 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] printf_wrong_types.c:18: 
   Translating call to printf to a call to the specialized version printf_va_1.
@@ -407,23 +407,23 @@ int main(void)
 }
 
 
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] printf_wrong_types.c:18: 
   Translating call to printf to a call to the specialized version printf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle b/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle
index 114680f3b2c..1cc8b667248 100644
--- a/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] scanf.c:12: 
   Translating call to scanf to a call to the specialized version scanf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle b/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle
index b9054e59855..0e55f1c5d20 100644
--- a/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] scanf.c:12: 
   Translating call to scanf to a call to the specialized version scanf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle b/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle
index df9b5a1ff9e..141acf79364 100644
--- a/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] scanf_loop.c:6: 
   Translating call to scanf to a call to the specialized version scanf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/scanf_wrong.res.oracle b/src/plugins/variadic/tests/known/oracle/scanf_wrong.res.oracle
index a7e2ef1c07d..24636a24da7 100644
--- a/src/plugins/variadic/tests/known/oracle/scanf_wrong.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/scanf_wrong.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] scanf_wrong.c:8: 
   Translating call to scanf to a call to the specialized version scanf_va_1.
diff --git a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
index ed580374284..457094451bc 100644
--- a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
@@ -1,30 +1,30 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] snprintf.c:12: 
   Translating call to snprintf to a call to the specialized version snprintf_va_1.
 [variadic] snprintf.c:15: 
   Translating call to snprintf to a call to the specialized version snprintf_va_2.
 [eva] Analyzing a complete application starting at main
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] using specification for function snprintf_va_1
-[eva] FRAMAC_SHARE/libc/stdio.h:213: 
+[eva] FRAMAC_SHARE/libc/stdio.h:250: 
   Cannot evaluate range bound format_length(format) - 1
   (unsupported ACSL construct: logic function format_length). Approximating
 [eva:alarm] snprintf.c:12: Warning: 
diff --git a/src/plugins/variadic/tests/known/oracle/stdio_print.res.oracle b/src/plugins/variadic/tests/known/oracle/stdio_print.res.oracle
index 020807ce6e3..b5923708164 100644
--- a/src/plugins/variadic/tests/known/oracle/stdio_print.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/stdio_print.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] stdio_print.c:9: Warning: 
   Call to function fprintf with non-static format argument: assuming that parameters are coherent with the format, and that no %n specifiers are present in the actual string.
diff --git a/src/plugins/variadic/tests/known/oracle/stdio_scan.res.oracle b/src/plugins/variadic/tests/known/oracle/stdio_scan.res.oracle
index cc53216b3d4..b16246f36ad 100644
--- a/src/plugins/variadic/tests/known/oracle/stdio_scan.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/stdio_scan.res.oracle
@@ -1,20 +1,20 @@
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] stdio_scan.c:10: Warning: 
   Call to function fscanf with non-static format argument: assuming that parameters are coherent with the format, and that no %n specifiers are present in the actual string.
diff --git a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
index 2fadf3268d0..f395811f070 100644
--- a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
@@ -1,32 +1,32 @@
-[variadic] FRAMAC_SHARE/libc/wchar.h:295: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:309: 
   Declaration of variadic function fwprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:297: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:311: 
   Declaration of variadic function swprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:299: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:313: 
   Declaration of variadic function wprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:302: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:316: 
   Declaration of variadic function wscanf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:304: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:318: 
   Declaration of variadic function fwscanf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:306: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:320: 
   Declaration of variadic function swscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] swprintf.c:12: 
   Translating call to swprintf to a call to the specialized version swprintf_va_1.
@@ -35,7 +35,7 @@
 [eva] Analyzing a complete application starting at main
 [eva] using specification for function wmemset
 [eva] using specification for function swprintf_va_1
-[eva] FRAMAC_SHARE/libc/wchar.h:297: 
+[eva] FRAMAC_SHARE/libc/wchar.h:311: 
   Cannot evaluate range bound wformat_length(format) - 1
   (unsupported ACSL construct: logic function wformat_length). Approximating
 [eva:alarm] swprintf.c:12: Warning: 
diff --git a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
index d0f176337a2..42d8e77e446 100644
--- a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
@@ -1,32 +1,32 @@
-[variadic] FRAMAC_SHARE/libc/wchar.h:295: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:309: 
   Declaration of variadic function fwprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:297: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:311: 
   Declaration of variadic function swprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:299: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:313: 
   Declaration of variadic function wprintf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:302: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:316: 
   Declaration of variadic function wscanf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:304: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:318: 
   Declaration of variadic function fwscanf.
-[variadic] FRAMAC_SHARE/libc/wchar.h:306: 
+[variadic] FRAMAC_SHARE/libc/wchar.h:320: 
   Declaration of variadic function swscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:207: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:244: 
   Declaration of variadic function fprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:209: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:246: 
   Declaration of variadic function fscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:211: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:248: 
   Declaration of variadic function printf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:212: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:249: 
   Declaration of variadic function scanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:213: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:250: 
   Declaration of variadic function snprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:215: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:252: 
   Declaration of variadic function sprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:217: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:254: 
   Declaration of variadic function sscanf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:550: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:587: 
   Declaration of variadic function dprintf.
-[variadic] FRAMAC_SHARE/libc/stdio.h:610: 
+[variadic] FRAMAC_SHARE/libc/stdio.h:649: 
   Declaration of variadic function asprintf.
 [variadic] wchar.c:11: 
   Translating call to wprintf to a call to the specialized version wprintf_va_1.
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.0.res.oracle
index b9004920458..bfa67cf9aba 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.0.res.oracle
@@ -1,7 +1,7 @@
 # frama-c -wp [...]
 [kernel] Parsing terminates_call_options.c (with preprocessing)
 [wp] Running WP plugin...
-[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:719: Warning: 
+[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:729: Warning: 
   Neither code nor explicit exits and terminates for function div,
    generating default clauses. See -generated-spec-* options for more info
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.1.res.oracle
index caaa30dd88d..4c8c8d4c5e0 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/terminates_call_options.1.res.oracle
@@ -4,7 +4,7 @@
 [kernel:annot:missing-spec] terminates_call_options.c:17: Warning: 
   Neither code nor explicit exits and terminates for function declaration,
    generating default clauses. See -generated-spec-* options for more info
-[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:719: Warning: 
+[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:729: Warning: 
   Neither code nor explicit exits and terminates for function div,
    generating default clauses. See -generated-spec-* options for more info
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle
index 9cf86ae72c1..7a798998acf 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.0.res.oracle
@@ -1,7 +1,7 @@
 # frama-c -wp [...]
 [kernel] Parsing terminates_call_options.c (with preprocessing)
 [wp] Running WP plugin...
-[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:719: Warning: 
+[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:729: Warning: 
   Neither code nor explicit exits and terminates for function div,
    generating default clauses. See -generated-spec-* options for more info
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle
index 21329b07a96..d7d0e8e6b67 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/terminates_call_options.1.res.oracle
@@ -4,7 +4,7 @@
 [kernel:annot:missing-spec] terminates_call_options.c:17: Warning: 
   Neither code nor explicit exits and terminates for function declaration,
    generating default clauses. See -generated-spec-* options for more info
-[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:719: Warning: 
+[kernel:annot:missing-spec] FRAMAC_SHARE/libc/stdlib.h:729: Warning: 
   Neither code nor explicit exits and terminates for function div,
    generating default clauses. See -generated-spec-* options for more info
 [wp] Warning: Missing RTE guards
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle
index c445f32f58a..f48b3ded682 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/string_c.res.oracle
@@ -161,7 +161,7 @@ Prove: included(a_2, 1, a, n).
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 116) in 'memcpy':
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 132) in 'memcpy':
 Effect at line 38
 Prove: true.
 
@@ -793,47 +793,47 @@ Prove: included(a_2, 1, a, n).
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove':
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove':
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove' (1/7):
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove' (1/7):
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove' (2/7):
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove' (2/7):
 Effect at line 90
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove' (3/7):
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove' (3/7):
 Call Result at line 93
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove' (4/7):
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove' (4/7):
 Effect at line 101
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove' (5/7):
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove' (5/7):
 Effect at line 113
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove' (6/7):
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove' (6/7):
 Effect at line 115
 Prove: true.
 
 ------------------------------------------------------------
 
-Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 139) in 'memmove' (7/7):
+Goal Assigns (file FRAMAC_SHARE/libc/string.h, line 155) in 'memmove' (7/7):
 Effect at line 117
 Prove: true.
 
diff --git a/tests/builtins/oracle/alloc_weak.res.oracle b/tests/builtins/oracle/alloc_weak.res.oracle
index 6be26b1b41e..f13229d6c23 100644
--- a/tests/builtins/oracle/alloc_weak.res.oracle
+++ b/tests/builtins/oracle/alloc_weak.res.oracle
@@ -21,7 +21,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] alloc_weak.c:14: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for copy
 [eva] Done for function copy
diff --git a/tests/builtins/oracle/fam.res.oracle b/tests/builtins/oracle/fam.res.oracle
index a729605f74d..a7080fcb191 100644
--- a/tests/builtins/oracle/fam.res.oracle
+++ b/tests/builtins/oracle/fam.res.oracle
@@ -9,7 +9,7 @@
 [eva] fam.c:16: function memcpy: precondition 'valid_dest' got status valid.
 [eva] fam.c:16: function memcpy: precondition 'valid_src' got status valid.
 [eva] fam.c:16: function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/builtins/oracle/imprecise.res.oracle b/tests/builtins/oracle/imprecise.res.oracle
index 9ce39e3c01e..d1109bb30e9 100644
--- a/tests/builtins/oracle/imprecise.res.oracle
+++ b/tests/builtins/oracle/imprecise.res.oracle
@@ -99,7 +99,7 @@
 [eva] imprecise.c:51: Call to builtin memset
 [eva:alarm] imprecise.c:51: Warning: 
   function memset: precondition 'valid_s' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva:alarm] imprecise.c:53: Warning: out of bounds write. assert \valid(p2);
 [eva:alarm] imprecise.c:53: Warning: 
diff --git a/tests/builtins/oracle/malloc_bug_tr.res.oracle b/tests/builtins/oracle/malloc_bug_tr.res.oracle
index 809a48dc1f7..d2efa197350 100644
--- a/tests/builtins/oracle/malloc_bug_tr.res.oracle
+++ b/tests/builtins/oracle/malloc_bug_tr.res.oracle
@@ -19,7 +19,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] malloc_bug_tr.c:13: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] malloc_bug_tr.c:14: Call to builtin memcpy
 [eva:alarm] malloc_bug_tr.c:14: Warning: 
diff --git a/tests/builtins/oracle/memchr.res.oracle b/tests/builtins/oracle/memchr.res.oracle
index 0a694b9d8f4..95a734ff993 100644
--- a/tests/builtins/oracle/memchr.res.oracle
+++ b/tests/builtins/oracle/memchr.res.oracle
@@ -141,7 +141,7 @@
   Called from memchr.c:201.
 [eva] memchr.c:193: Call to builtin memset
 [eva] memchr.c:193: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Recording results for init_array_nondet
 [eva] Done for function init_array_nondet
diff --git a/tests/builtins/oracle/memcpy.0.res.oracle b/tests/builtins/oracle/memcpy.0.res.oracle
index 16129de5ab8..8e98d1f82e5 100644
--- a/tests/builtins/oracle/memcpy.0.res.oracle
+++ b/tests/builtins/oracle/memcpy.0.res.oracle
@@ -29,7 +29,7 @@
   function memcpy: precondition 'valid_dest' got status unknown.
 [eva] memcpy.c:32: function memcpy: precondition 'valid_src' got status valid.
 [eva] memcpy.c:32: function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for buggy
 [from] Computing for function buggy
@@ -1072,6 +1072,21 @@
 [  Valid  ] Behavior 'not_found'
             by Frama-C kernel.
 
+--------------------------------------------------------------------------------
+--- Properties of Function 'rawmemchr'
+--------------------------------------------------------------------------------
+
+[ Extern  ] Post-condition 'result_valid_read'
+            Unverifiable but considered Valid.
+[ Extern  ] Post-condition 'result_same_base'
+            Unverifiable but considered Valid.
+[ Extern  ] Assigns nothing
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 120)
+            Unverifiable but considered Valid.
+[  Valid  ] Default behavior
+            by Frama-C kernel.
+
 --------------------------------------------------------------------------------
 --- Properties of Function 'memcpy'
 --------------------------------------------------------------------------------
@@ -1086,11 +1101,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'result_ptr'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 116)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 132)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 116)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 132)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 117)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 133)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1103,11 +1118,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'result_next_byte'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 129)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 145)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 129)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 145)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 130)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 146)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1120,11 +1135,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'result_ptr'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 139)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 155)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 139)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 155)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 140)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 156)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1137,11 +1152,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'result_ptr'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 149)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 165)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 149)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 165)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 150)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 166)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1154,7 +1169,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 159)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 175)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1167,7 +1182,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 165)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 181)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1180,7 +1195,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 172)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 188)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1193,7 +1208,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 180)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 196)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1204,7 +1219,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 187)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 203)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1227,7 +1242,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 194)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 210)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1246,7 +1261,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 213)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 229)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1259,7 +1274,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 221)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 237)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1272,7 +1287,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 231)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 247)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1285,7 +1300,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 240)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 256)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1298,7 +1313,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 249)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 265)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1311,7 +1326,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 260)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 276)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1324,7 +1339,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 273)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 289)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1345,31 +1360,31 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'resume_str' 'ptr_same_base'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 289)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 305)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 304)
+[ Extern  ] Assigns for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 320)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 316)
+[ Extern  ] Assigns for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 332)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 289)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 305)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 291)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 307)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 293)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 309)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 295)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 311)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 304)
+[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 320)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 306)
+[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 322)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 307)
+[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 323)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 316)
+[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 332)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 319)
+[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 335)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 322)
+[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 338)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1394,31 +1409,31 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'resume_str' 'saveptr_same_base'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 341)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 357)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 356)
+[ Extern  ] Assigns for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 372)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 369)
+[ Extern  ] Assigns for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 385)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 341)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 357)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 343)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 359)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 345)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 361)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 347)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 363)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 356)
+[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 372)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 358)
+[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 374)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 359)
+[ Extern  ] Froms for 'new_str' (file FRAMAC_SHARE/libc/string.h, line 375)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 369)
+[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 385)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 372)
+[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 388)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 375)
+[ Extern  ] Froms for 'resume_str' (file FRAMAC_SHARE/libc/string.h, line 391)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1435,11 +1450,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'valid_stringp' 'valid_result'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 391)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 407)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 391)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 407)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 392)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 408)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1460,7 +1475,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 410)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 426)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1473,11 +1488,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'result_ptr'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 423)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 439)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 423)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 439)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 424)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 440)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1494,11 +1509,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'partial' 'equal_prefix'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 435)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 451)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 435)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 451)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 436)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 452)
             Unverifiable but considered Valid.
 [  Valid  ] Behavior 'complete'
             by Frama-C kernel.
@@ -1515,11 +1530,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'bounded_result'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 456)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 472)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 456)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 472)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 457)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 473)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1532,11 +1547,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'points_to_end'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 468)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 484)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 468)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 484)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 469)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 485)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1553,11 +1568,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'result_ptr'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 481)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 497)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 481)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 497)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 484)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 500)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1572,23 +1587,23 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'partial' 'sum_of_bounded_lengths'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'complete' (file FRAMAC_SHARE/libc/string.h, line 508)
+[ Extern  ] Assigns for 'complete' (file FRAMAC_SHARE/libc/string.h, line 524)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 502)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 518)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'partial' (file FRAMAC_SHARE/libc/string.h, line 515)
+[ Extern  ] Assigns for 'partial' (file FRAMAC_SHARE/libc/string.h, line 531)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'complete' (file FRAMAC_SHARE/libc/string.h, line 508)
+[ Extern  ] Froms for 'complete' (file FRAMAC_SHARE/libc/string.h, line 524)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'complete' (file FRAMAC_SHARE/libc/string.h, line 510)
+[ Extern  ] Froms for 'complete' (file FRAMAC_SHARE/libc/string.h, line 526)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 502)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 518)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 503)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 519)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'partial' (file FRAMAC_SHARE/libc/string.h, line 515)
+[ Extern  ] Froms for 'partial' (file FRAMAC_SHARE/libc/string.h, line 531)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'partial' (file FRAMAC_SHARE/libc/string.h, line 517)
+[ Extern  ] Froms for 'partial' (file FRAMAC_SHARE/libc/string.h, line 533)
             Unverifiable but considered Valid.
 [  Valid  ] Behavior 'complete'
             by Frama-C kernel.
@@ -1603,11 +1618,11 @@
 
 [ Extern  ] Post-condition 'bounded_result'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 532)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 548)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 532)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 548)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 533)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 549)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1616,11 +1631,11 @@
 --- Properties of Function 'strxfrm'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 542)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 558)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 542)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 558)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 543)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 559)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1635,7 +1650,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 551)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 567)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1650,19 +1665,19 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'no_allocation' 'result_null'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 570)
+[ Extern  ] Assigns for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 586)
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
 [ Extern  ] Assigns for 'no_allocation' nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 570)
+[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 586)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 572)
+[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 588)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 567)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 583)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'no_allocation' (file FRAMAC_SHARE/libc/string.h, line 579)
+[ Extern  ] Froms for 'no_allocation' (file FRAMAC_SHARE/libc/string.h, line 595)
             Unverifiable but considered Valid.
 [  Valid  ] Behavior 'allocation'
             by Frama-C kernel.
@@ -1670,7 +1685,7 @@
             by Frama-C kernel.
 [  Valid  ] Behavior 'no_allocation'
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/string.h, line 566) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/string.h, line 582) 
             Unverifiable but considered Valid.
 [ Extern  ] Frees/Allocates for 'no_allocation' nothing/nothing 
             Unverifiable but considered Valid.
@@ -1685,19 +1700,19 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'no_allocation' 'result_null'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 594)
+[ Extern  ] Assigns for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 610)
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
 [ Extern  ] Assigns for 'no_allocation' nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 594)
+[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 610)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 595)
+[ Extern  ] Froms for 'allocation' (file FRAMAC_SHARE/libc/string.h, line 611)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 590)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 606)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'no_allocation' (file FRAMAC_SHARE/libc/string.h, line 605)
+[ Extern  ] Froms for 'no_allocation' (file FRAMAC_SHARE/libc/string.h, line 621)
             Unverifiable but considered Valid.
 [  Valid  ] Behavior 'allocation'
             by Frama-C kernel.
@@ -1705,7 +1720,7 @@
             by Frama-C kernel.
 [  Valid  ] Behavior 'no_allocation'
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/string.h, line 589) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/string.h, line 605) 
             Unverifiable but considered Valid.
 [ Extern  ] Frees/Allocates for 'no_allocation' nothing/nothing 
             Unverifiable but considered Valid.
@@ -1728,11 +1743,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition for 'src_too_long' 'result_points_to_end'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 615)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/string.h, line 631)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 615)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 631)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 616)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 632)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -1753,7 +1768,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 642)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/string.h, line 658)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -2268,9 +2283,9 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-   174 Completely validated
+   175 Completely validated
      1 Locally validated
-   277 Considered valid
+   281 Considered valid
     36 To be validated
-   488 Total
+   493 Total
 --------------------------------------------------------------------------------
diff --git a/tests/builtins/oracle/memcpy2.res.oracle b/tests/builtins/oracle/memcpy2.res.oracle
index 7a2e4458ddb..1f33976d31f 100644
--- a/tests/builtins/oracle/memcpy2.res.oracle
+++ b/tests/builtins/oracle/memcpy2.res.oracle
@@ -14,7 +14,7 @@
 [eva] memcpy2.c:10: function memcpy: precondition 'valid_dest' got status valid.
 [eva] memcpy2.c:10: function memcpy: precondition 'valid_src' got status valid.
 [eva] memcpy2.c:10: function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] memcpy2.c:12: 
   Frama_C_dump_each:
diff --git a/tests/builtins/oracle/memcpy_invalid.res.oracle b/tests/builtins/oracle/memcpy_invalid.res.oracle
index 3f5a13b66c9..379631e0982 100644
--- a/tests/builtins/oracle/memcpy_invalid.res.oracle
+++ b/tests/builtins/oracle/memcpy_invalid.res.oracle
@@ -17,7 +17,7 @@
   function memcpy: precondition 'valid_src' got status unknown.
 [eva] memcpy_invalid.c:17: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for test
 [from] Computing for function test
diff --git a/tests/builtins/oracle/memset.res.oracle b/tests/builtins/oracle/memset.res.oracle
index ce26d8999c1..8d3fb8dfc87 100644
--- a/tests/builtins/oracle/memset.res.oracle
+++ b/tests/builtins/oracle/memset.res.oracle
@@ -33,7 +33,7 @@
   Called from memset.c:113.
 [eva] memset.c:33: Call to builtin memset
 [eva] memset.c:33: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva:alarm] memset.c:34: Warning: 
   pointer downcast. assert (unsigned int)((int *)t2) ≤ 2147483647;
diff --git a/tests/builtins/oracle/memset_malloc_0.res.oracle b/tests/builtins/oracle/memset_malloc_0.res.oracle
index f397248b81e..a9308e4c721 100644
--- a/tests/builtins/oracle/memset_malloc_0.res.oracle
+++ b/tests/builtins/oracle/memset_malloc_0.res.oracle
@@ -9,7 +9,7 @@
 [eva] memset_malloc_0.c:18: Call to builtin memset
 [eva] memset_malloc_0.c:18: 
   function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/builtins/oracle/precise_memset.res.oracle b/tests/builtins/oracle/precise_memset.res.oracle
index 323e1f8213b..6e75f361237 100644
--- a/tests/builtins/oracle/precise_memset.res.oracle
+++ b/tests/builtins/oracle/precise_memset.res.oracle
@@ -22,7 +22,7 @@
 [eva] precise_memset.c:72: Call to builtin memset
 [eva] precise_memset.c:72: 
   function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] precise_memset.c:73: Call to builtin memset
 [eva] precise_memset.c:73: 
diff --git a/tests/builtins/oracle/strchr.res.oracle b/tests/builtins/oracle/strchr.res.oracle
index 924eddff1f5..577719cd86e 100644
--- a/tests/builtins/oracle/strchr.res.oracle
+++ b/tests/builtins/oracle/strchr.res.oracle
@@ -23,7 +23,7 @@
 [eva] strchr.c:88: Call to builtin strchr
 [eva] strchr.c:88: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:202: 
+[eva] FRAMAC_SHARE/libc/string.h:218: 
   cannot evaluate ACSL term, unsupported logic var p
 [eva] strchr.c:88: Frama_C_show_each_mystrchr: {3}
 [eva] strchr.c:89: assertion got status valid.
@@ -92,7 +92,7 @@
   Called from strchr.c:197.
 [eva] strchr.c:189: Call to builtin memset
 [eva] strchr.c:189: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Recording results for init_array_nondet
 [eva] Done for function init_array_nondet
diff --git a/tests/builtins/oracle/strlen.res.oracle b/tests/builtins/oracle/strlen.res.oracle
index 0cbb3fda54f..2d6111ad504 100644
--- a/tests/builtins/oracle/strlen.res.oracle
+++ b/tests/builtins/oracle/strlen.res.oracle
@@ -93,7 +93,7 @@
   Called from strlen.c:168.
 [eva] strlen.c:161: Call to builtin memset
 [eva] strlen.c:161: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Recording results for init_array_nondet
 [eva] Done for function init_array_nondet
diff --git a/tests/builtins/oracle/strnlen2.res.oracle b/tests/builtins/oracle/strnlen2.res.oracle
index 9b3f015bc35..e801b85f736 100644
--- a/tests/builtins/oracle/strnlen2.res.oracle
+++ b/tests/builtins/oracle/strnlen2.res.oracle
@@ -93,7 +93,7 @@
   Called from strnlen2.c:144.
 [eva] strnlen2.c:138: Call to builtin memset
 [eva] strnlen2.c:138: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Recording results for init_array_nondet
 [eva] Done for function init_array_nondet
diff --git a/tests/builtins/oracle/wcslen.res.oracle b/tests/builtins/oracle/wcslen.res.oracle
index 9faaf9d0231..3e0d35cee3c 100644
--- a/tests/builtins/oracle/wcslen.res.oracle
+++ b/tests/builtins/oracle/wcslen.res.oracle
@@ -93,7 +93,7 @@
   Called from wcslen.c:168.
 [eva] wcslen.c:161: Call to builtin memset
 [eva] wcslen.c:161: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Recording results for init_array_nondet
 [eva] Done for function init_array_nondet
diff --git a/tests/builtins/oracle/write-const.res.oracle b/tests/builtins/oracle/write-const.res.oracle
index eab4ebd1233..21391d72e6d 100644
--- a/tests/builtins/oracle/write-const.res.oracle
+++ b/tests/builtins/oracle/write-const.res.oracle
@@ -15,7 +15,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] write-const.c:18: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] write-const.c:19: 
   Frama_C_dump_each:
@@ -42,7 +42,7 @@
 [eva] write-const.c:25: Call to builtin memset
 [eva:alarm] write-const.c:25: Warning: 
   function memset: precondition 'valid_s' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] write-const.c:26: 
   Frama_C_dump_each:
diff --git a/tests/fc_script/make-machdep.t/run.t b/tests/fc_script/make-machdep.t/run.t
index 8250b8f744f..d62cb5d53b3 100644
--- a/tests/fc_script/make-machdep.t/run.t
+++ b/tests/fc_script/make-machdep.t/run.t
@@ -10,6 +10,7 @@
   alignof_ptr: 8
   alignof_short: 2
   alignof_str: 1
+  max_align_t: long double
   bufsiz: '8192'
   char_is_unsigned: false
   compiler: clang
diff --git a/tests/idct/oracle/ieee_1180_1990.res.oracle b/tests/idct/oracle/ieee_1180_1990.res.oracle
index 32e6e21539e..2c969383f1f 100644
--- a/tests/idct/oracle/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle/ieee_1180_1990.res.oracle
@@ -1078,7 +1078,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 76)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 78)
             assigns \result
               \from (indirect: *(filename + (0 .. strlen{Old}(filename))));
             Unverifiable but considered Valid.
@@ -1096,7 +1096,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 85)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 87)
             assigns \result
               \from (indirect: *(old_name + (0 .. strlen{Old}(old_name)))),
                     (indirect: *(new_name + (0 .. strlen{Old}(new_name))));
@@ -1105,6 +1105,46 @@
             default behavior
             by Frama-C kernel.
 
+--------------------------------------------------------------------------------
+--- Properties of Function 'renameat'
+--------------------------------------------------------------------------------
+
+[ Extern  ] Post-condition 'result_ok_or_error'
+            ensures result_ok_or_error: \result ≡ 0 ∨ \result ≡ -1
+            Unverifiable but considered Valid.
+[ Extern  ] Assigns nothing
+            assigns \nothing;
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 101)
+            assigns \result
+              \from (indirect: *(old_name + (0 .. strlen{Old}(old_name)))),
+                    (indirect: *(new_name + (0 .. strlen{Old}(new_name)))),
+                    (indirect: olddirfd), (indirect: newdirfd);
+            Unverifiable but considered Valid.
+[  Valid  ] Default behavior
+            default behavior
+            by Frama-C kernel.
+
+--------------------------------------------------------------------------------
+--- Properties of Function 'renameat2'
+--------------------------------------------------------------------------------
+
+[ Extern  ] Post-condition 'result_ok_or_error'
+            ensures result_ok_or_error: \result ≡ 0 ∨ \result ≡ -1
+            Unverifiable but considered Valid.
+[ Extern  ] Assigns nothing
+            assigns \nothing;
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 119)
+            assigns \result
+              \from (indirect: *(old_name + (0 .. strlen{Old}(old_name)))),
+                    (indirect: *(new_name + (0 .. strlen{Old}(new_name)))),
+                    (indirect: olddirfd), (indirect: newdirfd);
+            Unverifiable but considered Valid.
+[  Valid  ] Default behavior
+            default behavior
+            by Frama-C kernel.
+
 --------------------------------------------------------------------------------
 --- Properties of Function 'tmpfile'
 --------------------------------------------------------------------------------
@@ -1118,7 +1158,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 95)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 132)
             assigns \result \from __fc_p_fopen;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1135,18 +1175,18 @@
               \result ≡ \null ∨ \result ≡ \old(s) ∨
               \result ≡ __fc_p_tmpnam
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 109)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 146)
             assigns *(__fc_p_tmpnam + (0 .. 20)), *(s + (0 .. 20)), \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 109)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 146)
             assigns *(__fc_p_tmpnam + (0 .. 20))
               \from *(__fc_p_tmpnam + (0 .. 20)), (indirect: s);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 111)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 148)
             assigns *(s + (0 .. 20))
               \from (indirect: s), *(__fc_p_tmpnam + (0 .. 20));
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 112)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 149)
             assigns \result \from s, __fc_p_tmpnam;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1163,7 +1203,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 121)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 158)
             assigns \result \from (indirect: stream), (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1177,37 +1217,37 @@
 [ Extern  ] Post-condition 'result_zero_or_EOF'
             ensures result_zero_or_EOF: \result ≡ 0 ∨ \result ≡ -1
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 130)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 167)
             assigns \result, *stream, __fc_fopen[0 .. 16 - 1];
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 137)
+[ Extern  ] Assigns for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 174)
             assigns __fc_fopen[0 .. 16 - 1], \result;
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 142)
+[ Extern  ] Assigns for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 179)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 130)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 167)
             assigns \result
               \from (indirect: *stream), (indirect: __fc_fopen[0 .. 16 - 1]);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 132)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 169)
             assigns *stream
               \from (indirect: stream), *stream, __fc_fopen[0 .. 16 - 1];
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 132)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 169)
             assigns __fc_fopen[0 .. 16 - 1]
               \from (indirect: stream), *stream, __fc_fopen[0 .. 16 - 1];
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 137)
+[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 174)
             assigns __fc_fopen[0 .. 16 - 1] \from __fc_fopen[0 .. 16 - 1];
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 139)
+[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 176)
             assigns \result \from (indirect: __fc_fopen[0 .. 16 - 1]);
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 142)
+[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 179)
             assigns *stream \from *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 143)
+[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 180)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1233,7 +1273,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 152)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 189)
             assigns \result
               \from (indirect: *(filename + (0 .. strlen{Old}(filename)))),
                     (indirect: *(mode + (0 .. strlen{Old}(mode)))),
@@ -1253,16 +1293,16 @@
               \result ≡ \null ∨
               \subset(\result, &__fc_fopen[0 .. 16 - 1])
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 162)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 199)
             assigns \result, __fc_fopen[fd];
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 162)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 199)
             assigns \result
               \from (indirect: fd),
                     (indirect: *(mode + (0 .. strlen{Old}(mode)))),
                     (indirect: __fc_fopen[fd]), __fc_p_fopen;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 162)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 199)
             assigns __fc_fopen[fd]
               \from (indirect: fd),
                     (indirect: *(mode + (0 .. strlen{Old}(mode)))),
@@ -1284,16 +1324,16 @@
 [ Extern  ] Post-condition 'stream_opened'
             ensures stream_opened: *\old(stream) ∈ __fc_fopen[0 .. 16 - 1]
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 174)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 211)
             assigns \result, *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 174)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 211)
             assigns \result
               \from (indirect: *(filename + (..))),
                     (indirect: *(mode + (..))), __fc_p_fopen,
                     (indirect: stream);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 176)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 213)
             assigns *stream
               \from (indirect: *(filename + (..))),
                     (indirect: *(mode + (..))), __fc_p_fopen,
@@ -1307,10 +1347,10 @@
 --- Properties of Function 'setbuf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 187)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 224)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 187)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 224)
             assigns *stream \from buf;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1321,10 +1361,10 @@
 --- Properties of Function 'setvbuf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 191)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 228)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 191)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 228)
             assigns *stream \from buf, mode, size;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1335,13 +1375,13 @@
 --- Properties of Function 'vfprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 220)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 257)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 220)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 257)
             assigns *stream \from *(format + (..)), (indirect: arg);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 221)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 258)
             assigns \result
               \from (indirect: *(format + (..))), (indirect: arg);
             Unverifiable but considered Valid.
@@ -1353,10 +1393,10 @@
 --- Properties of Function 'vfscanf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 227)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 264)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 227)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 264)
             assigns *stream \from *(format + (..)), *stream;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1367,10 +1407,10 @@
 --- Properties of Function 'vprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 233)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 270)
             assigns *__fc_stdout;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 233)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 270)
             assigns *__fc_stdout \from arg;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1381,10 +1421,10 @@
 --- Properties of Function 'vscanf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 237)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 274)
             assigns *__fc_stdin;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 237)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 274)
             assigns *__fc_stdin \from *(format + (..));
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1395,10 +1435,10 @@
 --- Properties of Function 'vsnprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 242)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 279)
             assigns *(s + (0 .. n - 1));
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 242)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 279)
             assigns *(s + (0 .. n - 1)) \from *(format + (..)), arg;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1409,10 +1449,10 @@
 --- Properties of Function 'vsprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 248)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 285)
             assigns *(s + (0 ..));
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 248)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 285)
             assigns *(s + (0 ..)) \from *(format + (..)), arg;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1427,13 +1467,13 @@
             ensures
             result_uchar_or_eof: (0 ≤ \result ≤ 255U) ∨ \result ≡ -1
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 261)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 298)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 261)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 298)
             assigns *stream \from *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 262)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 299)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1458,14 +1498,14 @@
             terminated_string_on_success:
               \result ≢ \null ⇒ valid_string(\old(s))
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 270)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 307)
             assigns *(s + (0 .. size - 1)), \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 270)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 307)
             assigns *(s + (0 .. size - 1))
               \from (indirect: size), (indirect: *stream);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 271)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 308)
             assigns \result \from s, (indirect: size), (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1476,13 +1516,13 @@
 --- Properties of Function 'fputc'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 284)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 321)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 284)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 321)
             assigns *stream \from c, *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 285)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 322)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1493,13 +1533,13 @@
 --- Properties of Function 'fputs'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 291)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 328)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 291)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 328)
             assigns *stream \from *(s + (0 .. strlen{Old}(s))), *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 292)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 329)
             assigns \result
               \from (indirect: *(s + (0 .. strlen{Old}(s)))),
                     (indirect: *stream);
@@ -1512,13 +1552,13 @@
 --- Properties of Function 'getc'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 299)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 336)
             assigns \result, *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 299)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 336)
             assigns \result \from *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 299)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 336)
             assigns *stream \from *stream;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1529,13 +1569,13 @@
 --- Properties of Function 'getchar'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 304)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 341)
             assigns \result, *__fc_stdin;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 304)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 341)
             assigns \result \from *__fc_stdin;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 304)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 341)
             assigns *__fc_stdin \from *__fc_stdin;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1550,16 +1590,16 @@
             ensures
             result_null_or_same: \result ≡ \old(s) ∨ \result ≡ \null
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 317)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 354)
             assigns *(s + (0 .. gets_length{Old})), \result, *__fc_stdin;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 317)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 354)
             assigns *(s + (0 .. gets_length{Old})) \from *__fc_stdin;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 318)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 355)
             assigns \result \from s, *__fc_stdin;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 319)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 356)
             assigns *__fc_stdin \from *__fc_stdin;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1570,13 +1610,13 @@
 --- Properties of Function 'putc'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 326)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 363)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 326)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 363)
             assigns *stream \from c, *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 327)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 364)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1587,13 +1627,13 @@
 --- Properties of Function 'putchar'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 332)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 369)
             assigns *__fc_stdout, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 332)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 369)
             assigns *__fc_stdout \from c, *__fc_stdout;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 333)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 370)
             assigns \result \from (indirect: *__fc_stdout);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1604,14 +1644,14 @@
 --- Properties of Function 'puts'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 339)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 376)
             assigns *__fc_stdout, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 339)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 376)
             assigns *__fc_stdout
               \from *(s + (0 .. strlen{Old}(s))), *__fc_stdout;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 340)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 377)
             assigns \result
               \from (indirect: *(s + (0 .. strlen{Old}(s)))),
                     (indirect: *__fc_stdout);
@@ -1628,13 +1668,13 @@
             ensures
             result_ok_or_error: \result ≡ \old(c) ∨ \result ≡ -1
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 346)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 383)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 346)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 383)
             assigns *stream \from (indirect: c);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 347)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 384)
             assigns \result \from (indirect: c), (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1654,19 +1694,19 @@
               \initialized((char *)\old(ptr) +
                            (0 .. \result * \old(size) - 1))
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 355)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 392)
             assigns *((char *)ptr + (0 .. nmemb * size - 1)), *stream,
                     \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 355)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 392)
             assigns *((char *)ptr + (0 .. nmemb * size - 1))
               \from (indirect: size), (indirect: nmemb), (indirect: *stream);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 355)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 392)
             assigns *stream
               \from (indirect: size), (indirect: nmemb), (indirect: *stream);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 357)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 394)
             assigns \result \from size, (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1680,14 +1720,14 @@
 [ Extern  ] Post-condition 'size_written'
             ensures size_written: \result ≤ \old(nmemb)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 368)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 405)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 368)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 405)
             assigns *stream
               \from (indirect: *((char *)ptr + (0 .. nmemb * size - 1)));
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 368)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 405)
             assigns \result
               \from (indirect: *((char *)ptr + (0 .. nmemb * size - 1)));
             Unverifiable but considered Valid.
@@ -1702,13 +1742,13 @@
 [ Extern  ] Post-condition 'initialization,pos'
             ensures initialization: pos: \initialized(\old(pos))
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 379)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 416)
             assigns \result, *pos;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 379)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 416)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 379)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 416)
             assigns *pos \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1724,19 +1764,19 @@
             errno_set:
               __fc_errno ∈ {11, 9, 27, 4, 22, 5, 28, 75, 32, 29, 6}
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 388)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 425)
             assigns *stream, \result, __fc_errno;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 388)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 425)
             assigns *stream
               \from *stream, (indirect: offset), (indirect: whence);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 389)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 426)
             assigns \result
               \from (indirect: *stream), (indirect: offset),
                     (indirect: whence);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 389)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 426)
             assigns __fc_errno
               \from (indirect: *stream), (indirect: offset),
                     (indirect: whence);
@@ -1754,19 +1794,19 @@
             errno_set:
               __fc_errno ∈ {11, 9, 27, 4, 22, 5, 28, 75, 32, 29, 6}
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 399)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 436)
             assigns *stream, \result, __fc_errno;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 399)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 436)
             assigns *stream
               \from *stream, (indirect: offset), (indirect: whence);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 400)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 437)
             assigns \result
               \from (indirect: *stream), (indirect: offset),
                     (indirect: whence);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 400)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 437)
             assigns __fc_errno
               \from (indirect: *stream), (indirect: offset),
                     (indirect: whence);
@@ -1783,16 +1823,16 @@
             ensures
             errno_set: __fc_errno ∈ {11, 9, 27, 4, 5, 28, 32, 29, 6}
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 411)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 448)
             assigns *stream, \result, __fc_errno;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 411)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 448)
             assigns *stream \from *pos;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 412)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 449)
             assigns \result \from (indirect: *stream), (indirect: *pos);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 413)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 450)
             assigns __fc_errno
               \from __fc_errno, (indirect: *stream), (indirect: *pos);
             Unverifiable but considered Valid.
@@ -1813,13 +1853,13 @@
 [ Extern  ] Post-condition 'errno_set'
             ensures errno_set: __fc_errno ∈ {9, 75, 29}
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 421)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 458)
             assigns \result, __fc_errno;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 421)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 458)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 421)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 458)
             assigns __fc_errno \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1839,13 +1879,13 @@
 [ Extern  ] Post-condition 'errno_set'
             ensures errno_set: __fc_errno ∈ {9, 75, 29}
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 430)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 467)
             assigns \result, __fc_errno;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 430)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 467)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 430)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 467)
             assigns __fc_errno \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1856,10 +1896,10 @@
 --- Properties of Function 'rewind'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 439)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 476)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 439)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 476)
             assigns *stream \from \nothing;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1870,10 +1910,10 @@
 --- Properties of Function 'clearerr'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 445)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 482)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 445)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 482)
             assigns *stream \from \nothing;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1887,7 +1927,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 451)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 488)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1901,7 +1941,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 457)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 494)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1912,10 +1952,10 @@
 --- Properties of Function 'flockfile'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 463)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 500)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 463)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 500)
             assigns *stream \from \nothing;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1926,10 +1966,10 @@
 --- Properties of Function 'funlockfile'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 469)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 506)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 469)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 506)
             assigns *stream \from \nothing;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1940,13 +1980,13 @@
 --- Properties of Function 'ftrylockfile'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 475)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 512)
             assigns \result, *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 475)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 512)
             assigns \result \from \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 475)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 512)
             assigns *stream \from \nothing;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1960,7 +2000,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 481)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 518)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -1971,10 +2011,10 @@
 --- Properties of Function 'perror'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 487)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 524)
             assigns __fc_stdout;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 487)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 524)
             assigns __fc_stdout
               \from __fc_errno, *(s + (0 .. strlen{Old}(s)));
             Unverifiable but considered Valid.
@@ -1986,13 +2026,13 @@
 --- Properties of Function 'getc_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 493)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 530)
             assigns \result, *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 493)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 530)
             assigns \result \from *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 493)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 530)
             assigns *stream \from *stream;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2006,7 +2046,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 498)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 535)
             assigns \result \from *__fc_stdin;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2017,13 +2057,13 @@
 --- Properties of Function 'putc_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 504)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 541)
             assigns *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 504)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 541)
             assigns *stream \from c;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 505)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 542)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2034,13 +2074,13 @@
 --- Properties of Function 'putchar_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 510)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 547)
             assigns *__fc_stdout, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 510)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 547)
             assigns *__fc_stdout \from c;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 511)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 548)
             assigns \result \from (indirect: *__fc_stdout);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2051,10 +2091,10 @@
 --- Properties of Function 'clearerr_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 517)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 554)
             assigns *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 517)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 554)
             assigns *stream \from \nothing;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2068,7 +2108,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 523)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 560)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2082,7 +2122,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 529)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 566)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2096,7 +2136,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 535)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 572)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2114,14 +2154,14 @@
               (\subset(\result, &__fc_fopen[0 .. 16 - 1]) ∧
                is_open_pipe(\result))
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 562)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 599)
             assigns \result, __fc_fopen[0 ..];
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 562)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 599)
             assigns \result
               \from (indirect: *command), (indirect: *type), __fc_p_fopen;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 564)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 601)
             assigns __fc_fopen[0 ..]
               \from (indirect: *command), (indirect: *type), __fc_fopen[0 ..];
             Unverifiable but considered Valid.
@@ -2139,7 +2179,7 @@
 [ Extern  ] Assigns nothing
             assigns \nothing;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 576)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 613)
             assigns \result \from (indirect: *stream);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2150,19 +2190,42 @@
 --- Properties of Function 'getline'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 621)
             assigns *(*lineptr + (0 .. *n - 1)), *n, *stream, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
             assigns *(*lineptr + (0 .. *n - 1)) \from *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
             assigns *n \from *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
             assigns *stream \from *stream;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
+            assigns \result \from *stream;
+            Unverifiable but considered Valid.
+[  Valid  ] Default behavior
+            default behavior
+            by Frama-C kernel.
+
+--------------------------------------------------------------------------------
+--- Properties of Function 'getdelim'
+--------------------------------------------------------------------------------
+
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 623)
+            assigns *(*lineptr + (0 .. *n - 1)), *n, *stream, \result;
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
+            assigns *(*lineptr + (0 .. *n - 1)) \from *stream;
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
+            assigns *n \from *stream;
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
+            assigns *stream \from *stream;
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
             assigns \result \from *stream;
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
@@ -2183,15 +2246,15 @@
             errno_set:
               __fc_errno ≡ \old(__fc_errno) ∨ __fc_errno ∈ {22, 24, 12}
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 593)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 632)
             assigns __fc_errno, \result;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 593)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 632)
             assigns __fc_errno
               \from (indirect: buf), (indirect: size),
                     (indirect: *(mode + (0 .. strlen{Old}(mode))));
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 595)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 634)
             assigns \result
               \from __fc_p_fopen, (indirect: buf), (indirect: size),
                     (indirect: *(mode + (0 .. strlen{Old}(mode))));
@@ -2199,7 +2262,7 @@
 [  Valid  ] Default behavior
             default behavior
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 592) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 631) 
             allocates \old(buf);
             Unverifiable but considered Valid.
 
@@ -2211,25 +2274,25 @@
             ensures
             result_error_or_written_bytes: \result ≡ -1 ∨ \result ≥ 0
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 614)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 653)
             assigns __fc_heap_status, \result, *strp;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 614)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 653)
             assigns __fc_heap_status
               \from (indirect: *(fmt + (0 ..))), __fc_heap_status;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 615)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 654)
             assigns \result
               \from (indirect: *(fmt + (0 ..))), (indirect: __fc_heap_status);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 616)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 655)
             assigns *strp
               \from *(fmt + (0 ..)), (indirect: __fc_heap_status);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             default behavior
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 613) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 652) 
             allocates *\old(strp);
             Unverifiable but considered Valid.
 
@@ -2241,26 +2304,26 @@
             ensures
             result_error_or_written_bytes: \result ≡ -1 ∨ \result ≥ 0
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 627)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 666)
             assigns __fc_heap_status, \result, *strp;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 627)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 666)
             assigns __fc_heap_status
               \from (indirect: *(fmt + (0 ..))), (indirect: ap),
                     __fc_heap_status;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 629)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 668)
             assigns \result
               \from (indirect: *(fmt + (0 ..))), (indirect: __fc_heap_status);
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 630)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 669)
             assigns *strp
               \from *(fmt + (0 ..)), ap, (indirect: __fc_heap_status);
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             default behavior
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 626) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 665) 
             allocates *\old(strp);
             Unverifiable but considered Valid.
 
@@ -4245,12 +4308,12 @@
             assert Eva: initialization: \initialized(&res[i].pme[j][k]);
             By RedundantAlarms, with pending:
              - Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 368)
-[  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
+[  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
 
             status of 'requires
             valid_read_string(format)' of printf_va_1 at stmt 238
             by Eva.
-[  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
+[  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
 
             status of 'requires
             valid_read_string(format)' of printf_va_2 at stmt 239
@@ -4260,19 +4323,19 @@
 --- Properties of Function 'printf_va_1'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[  Valid  ] Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)
             requires valid_read_string(format)
             by Call Preconditions.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 248)
             assigns \result, __fc_stdout->__fc_FILE_data;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 248)
             assigns \result
               \from (indirect: __fc_stdout->__fc_FILE_id),
                     (indirect: __fc_stdout->__fc_FILE_data),
                     (indirect: *(format + (0 ..)));
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 248)
             assigns __fc_stdout->__fc_FILE_data
               \from (indirect: __fc_stdout->__fc_FILE_id),
                     __fc_stdout->__fc_FILE_data,
@@ -4286,19 +4349,19 @@
 --- Properties of Function 'printf_va_2'
 --------------------------------------------------------------------------------
 
-[  Valid  ] Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[  Valid  ] Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)
             requires valid_read_string(format)
             by Call Preconditions.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 248)
             assigns \result, __fc_stdout->__fc_FILE_data;
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 248)
             assigns \result
               \from (indirect: __fc_stdout->__fc_FILE_id),
                     (indirect: __fc_stdout->__fc_FILE_data),
                     (indirect: *(format + (0 ..)));
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 211)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 248)
             assigns __fc_stdout->__fc_FILE_data
               \from (indirect: __fc_stdout->__fc_FILE_id),
                     __fc_stdout->__fc_FILE_data,
@@ -4311,9 +4374,9 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-   196 Completely validated
+   199 Completely validated
     16 Locally validated
-   581 Considered valid
+   592 Considered valid
     56 To be validated
-   849 Total
+   863 Total
 --------------------------------------------------------------------------------
diff --git a/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle b/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
index e69b1bce17c..657b6a08704 100644
--- a/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
@@ -265,7 +265,7 @@
 <      "output.\n"[bits 0 to 71]
 ---
 >     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]
-3963,3985d3797
+4026,4048d3860
 < [    -    ] Assertion 'Eva,initialization' (file idct.c, line 129)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
@@ -289,7 +289,7 @@
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             By RedundantAlarms, with pending:
 <              - Assertion 'Eva,initialization' (file idct.c, line 145)
-3989,4011d3800
+4052,4074d3863
 < [    -    ] Assertion 'Eva,initialization' (file idct.c, line 163)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
@@ -313,11 +313,11 @@
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             By RedundantAlarms, with pending:
 <              - Assertion 'Eva,initialization' (file idct.c, line 180)
-4033,4035d3821
+4096,4098d3884
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 109)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
-4039,4072d3824
+4102,4135d3887
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 116)
 <             assert Eva: initialization: \initialized(&tmp2[i][j]);
 <             tried with Eva.
@@ -352,11 +352,11 @@
 < [    -    ] Assertion 'Eva,float_to_int' (file ieee_1180_1990.c, line 124)
 <             assert Eva: float_to_int: tmp2[i][j] - 0.5 < 2147483648;
 <             tried with Eva.
-4093,4095d3844
+4156,4158d3907
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 150)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
-4099,4132d3847
+4162,4195d3910
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 157)
 <             assert Eva: initialization: \initialized(&tmp2[i][j]);
 <             tried with Eva.
@@ -391,7 +391,7 @@
 < [    -    ] Assertion 'Eva,float_to_int' (file ieee_1180_1990.c, line 165)
 <             assert Eva: float_to_int: tmp2[i][j] - 0.5 < 2147483648;
 <             tried with Eva.
-4232,4248c3947,3953
+4295,4311c4010,4016
 < [ Partial ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 358)
 <             assert Eva: initialization: \initialized(&res[i].pmse[j][k]);
 <             By RedundantAlarms, with pending:
@@ -408,7 +408,7 @@
 <             assert Eva: initialization: \initialized(&res[i].pme[j][k]);
 <             By RedundantAlarms, with pending:
 <              - Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 368)
-< [  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
+< [  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
 ---
 > [Unreachable] Unreachable call 'printf_va_1' (file ieee_1180_1990.c, line 195)
 >             reachability of stmt line 195 in main
@@ -416,31 +416,31 @@
 > [Unreachable] Unreachable call 'printf_va_2' (file ieee_1180_1990.c, line 196)
 >             reachability of stmt line 196 in main
 >             by Eva.
-> [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
-4252,4253c3957,3960
+> [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
+4315,4316c4020,4023
 <             by Eva.
-< [  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
+< [  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
 ---
 >             Locally valid, but unreachable.
 >             By Eva because:
 >              - Unreachable call 'printf_va_1' (file ieee_1180_1990.c, line 195)
-> [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 211)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
-4257c3964,3966
+> [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
+4320c4027,4029
 <             by Eva.
 ---
 >             Locally valid, but unreachable.
 >             By Eva because:
 >              - Unreachable call 'printf_va_2' (file ieee_1180_1990.c, line 196)
-4314,4315c4023
-<    196 Completely validated
+4377,4378c4086
+<    199 Completely validated
 <     16 Locally validated
 ---
->    194 Completely validated
-4317,4318c4025,4028
+>    197 Completely validated
+4380,4381c4088,4091
 <     56 To be validated
-<    849 Total
+<    863 Total
 ---
 >     32 To be validated
 >      2 Dead properties
 >      2 Unreachable
->    811 Total
+>    825 Total
diff --git a/tests/libc/oracle/argz_c.res.oracle b/tests/libc/oracle/argz_c.res.oracle
index 9b0b7650e7e..ddbc94e0adf 100644
--- a/tests/libc/oracle/argz_c.res.oracle
+++ b/tests/libc/oracle/argz_c.res.oracle
@@ -20,11 +20,13 @@
   \return(realloc) == 0 (auto)
   \return(reallocarray) == 0 (auto)
   \return(getenv) == 0 (auto)
+  \return(secure_getenv) == 0 (auto)
   \return(bsearch) == 0 (auto)
   \return(realpath) == 0 (auto)
   \return(canonicalize_file_name) == 0 (auto)
   \return(memchr) == 0 (auto)
   \return(memrchr) == 0 (auto)
+  \return(rawmemchr) == 0 (auto)
   \return(memcpy) == 0 (auto)
   \return(mempcpy) == 0 (auto)
   \return(memmove) == 0 (auto)
@@ -141,7 +143,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] FRAMAC_SHARE/libc/argz.c:279: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for argz_append
 [eva] Done for function argz_append
@@ -236,7 +238,7 @@
 [eva] FRAMAC_SHARE/libc/argz.c:135: Call to builtin strchr
 [eva] FRAMAC_SHARE/libc/argz.c:135: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:202: 
+[eva] FRAMAC_SHARE/libc/string.h:218: 
   cannot evaluate ACSL term, unsupported logic var p
 [eva] Recording results for argz_next
 [eva] Done for function argz_next
@@ -264,15 +266,15 @@
 [eva] Done for function strstr
 [eva] computing for function strndup <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:85.
-[eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:336: Automatic loop unrolling.
-[eva] FRAMAC_SHARE/libc/string.c:339: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/string.c:339: allocating variable __malloc_strndup_l339
-[eva] FRAMAC_SHARE/libc/string.c:344: Call to builtin memcpy
-[eva] FRAMAC_SHARE/libc/string.c:344: 
+[eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:347: Automatic loop unrolling.
+[eva] FRAMAC_SHARE/libc/string.c:350: Call to builtin malloc
+[eva] FRAMAC_SHARE/libc/string.c:350: allocating variable __malloc_strndup_l350
+[eva] FRAMAC_SHARE/libc/string.c:355: Call to builtin memcpy
+[eva] FRAMAC_SHARE/libc/string.c:355: 
   function memcpy: precondition 'valid_dest' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:344: 
+[eva] FRAMAC_SHARE/libc/string.c:355: 
   function memcpy: precondition 'valid_src' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:344: 
+[eva] FRAMAC_SHARE/libc/string.c:355: 
   function memcpy: precondition 'separation' got status valid.
 [eva] Recording results for strndup
 [eva] Done for function strndup
@@ -414,10 +416,10 @@
 [eva] Done for function strstr
 [eva] computing for function strndup <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:85.
-[eva] FRAMAC_SHARE/libc/string.c:339: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/string.c:339: 
-  allocating variable __malloc_strndup_l339_0
-[eva] FRAMAC_SHARE/libc/string.c:344: Call to builtin memcpy
+[eva] FRAMAC_SHARE/libc/string.c:350: Call to builtin malloc
+[eva] FRAMAC_SHARE/libc/string.c:350: 
+  allocating variable __malloc_strndup_l350_0
+[eva] FRAMAC_SHARE/libc/string.c:355: Call to builtin memcpy
 [eva] Recording results for strndup
 [eva] Done for function strndup
 [eva] computing for function str_append <- argz_replace <- main.
@@ -516,7 +518,7 @@
   function memmove: precondition 'valid_dest' got status valid.
 [eva] FRAMAC_SHARE/libc/argz.c:192: 
   function memmove: precondition 'valid_src' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:141: 
+[eva] FRAMAC_SHARE/libc/string.h:157: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Recording results for argz_delete
 [eva] Done for function argz_delete
@@ -1195,10 +1197,10 @@
   __fc_errno ∈ [--..--]
   __fc_heap_status ∈ [--..--]
   l ∈ {0}
-  p ∈ {{ NULL ; &__malloc_strndup_l339 ; &__malloc_strndup_l339_0 }}
-  __retres ∈ {{ NULL ; &__malloc_strndup_l339 ; &__malloc_strndup_l339_0 }}
-  __malloc_strndup_l339 ∈ {0}
-  __malloc_strndup_l339_0 ∈ {0}
+  p ∈ {{ NULL ; &__malloc_strndup_l350 ; &__malloc_strndup_l350_0 }}
+  __retres ∈ {{ NULL ; &__malloc_strndup_l350 ; &__malloc_strndup_l350_0 }}
+  __malloc_strndup_l350 ∈ {0}
+  __malloc_strndup_l350_0 ∈ {0}
 [eva:final-states] Values at end of function strstr:
   __retres ∈ {{ NULL ; &__realloc_argz_append_l277_1{[7], [18]} }}
 [eva:final-states] Values at end of function argz_replace:
diff --git a/tests/libc/oracle/coverage.res.oracle b/tests/libc/oracle/coverage.res.oracle
index ad475976a58..d576f9e03fa 100644
--- a/tests/libc/oracle/coverage.res.oracle
+++ b/tests/libc/oracle/coverage.res.oracle
@@ -28,7 +28,7 @@
   main: 4 stmts out of 4 (100.0%)
 [metrics] Eva coverage statistics
   =======================
-  Syntactically reachable functions = 2 (out of 108)
+  Syntactically reachable functions = 2 (out of 112)
   Semantically reached functions = 2
   Coverage estimation = 100.0%
 [metrics] Statements analyzed by Eva
diff --git a/tests/libc/oracle/fc_libc.0.res.oracle b/tests/libc/oracle/fc_libc.0.res.oracle
index 8a1386fbba1..038d15027a3 100644
--- a/tests/libc/oracle/fc_libc.0.res.oracle
+++ b/tests/libc/oracle/fc_libc.0.res.oracle
@@ -5,10 +5,10 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] fc_libc.c:209: assertion got status valid.
 [eva] fc_libc.c:210: assertion got status valid.
 [eva] fc_libc.c:211: assertion got status valid.
 [eva] fc_libc.c:212: assertion got status valid.
+[eva] fc_libc.c:213: assertion got status valid.
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
@@ -41,6 +41,7 @@
 #include "getopt.h"
 #include "glob.c"
 #include "glob.h"
+#include "grp.h"
 #include "iconv.h"
 #include "ifaddrs.h"
 #include "inttypes.c"
diff --git a/tests/libc/oracle/fc_libc.2.res.oracle b/tests/libc/oracle/fc_libc.2.res.oracle
index 35a6f3be165..fc829e7d3ab 100644
--- a/tests/libc/oracle/fc_libc.2.res.oracle
+++ b/tests/libc/oracle/fc_libc.2.res.oracle
@@ -1,6 +1,7 @@
 [kernel] Parsing fc_libc.c (with preprocessing)
 [kernel] Parsing FRAMAC_SHARE/libc/__fc_alloc_axiomatic.h (with preprocessing)
 [kernel] Parsing FRAMAC_SHARE/libc/__fc_builtin.h (with preprocessing)
+[kernel] Parsing FRAMAC_SHARE/libc/__fc_define_at.h (with preprocessing)
 [kernel] Parsing FRAMAC_SHARE/libc/__fc_define_blkcnt_t.h (with preprocessing)
 [kernel] Parsing FRAMAC_SHARE/libc/__fc_define_blksize_t.h (with preprocessing)
 [kernel] Parsing FRAMAC_SHARE/libc/__fc_define_clockid_t.h (with preprocessing)
diff --git a/tests/libc/oracle/fc_libc.4.res.oracle b/tests/libc/oracle/fc_libc.4.res.oracle
index 652d59eb985..148f02cf44d 100644
--- a/tests/libc/oracle/fc_libc.4.res.oracle
+++ b/tests/libc/oracle/fc_libc.4.res.oracle
@@ -4,5 +4,10 @@
 [kernel] Parsing glibc_functions.json
 [kernel] Parsing posix_identifiers.json
 [kernel] Parsing nonstandard_identifiers.json
+[kernel] Warning: <stdlib.h>:mkostemps : unknown identifier
 [kernel] Warning: <uchar.h>:mbrtoc8 : unknown identifier
+[kernel] Warning: <stdlib.h>:mkostemp : unknown identifier
 [kernel] Warning: <uchar.h>:c8rtomb : unknown identifier
+[kernel] Warning: <sys/stat.h>:lchmod : unknown identifier
+[kernel] Warning: <unistd.h>:euidaccess : unknown identifier
+[kernel] Warning: <stdio.h>:renameat2 : unknown identifier
diff --git a/tests/libc/oracle/netdb_c.res.oracle b/tests/libc/oracle/netdb_c.res.oracle
index 20d9dac5c58..3b729753094 100644
--- a/tests/libc/oracle/netdb_c.res.oracle
+++ b/tests/libc/oracle/netdb_c.res.oracle
@@ -15,6 +15,7 @@
   \return(realloc) == 0 (auto)
   \return(reallocarray) == 0 (auto)
   \return(getenv) == 0 (auto)
+  \return(secure_getenv) == 0 (auto)
   \return(bsearch) == 0 (auto)
   \return(realpath) == 0 (auto)
   \return(canonicalize_file_name) == 0 (auto)
@@ -22,6 +23,7 @@
   \return(ttyname) == 0 (auto)
   \return(memchr) == 0 (auto)
   \return(memrchr) == 0 (auto)
+  \return(rawmemchr) == 0 (auto)
   \return(memcpy) == 0 (auto)
   \return(mempcpy) == 0 (auto)
   \return(memmove) == 0 (auto)
@@ -78,7 +80,7 @@
   
 [eva] netdb_c.c:25: Call to builtin memset
 [eva] netdb_c.c:25: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] computing for function getaddrinfo <- main.
   Called from netdb_c.c:34.
@@ -157,7 +159,7 @@
   function strcpy: precondition 'room_string' got status valid.
 [eva] FRAMAC_SHARE/libc/netdb.c:74: 
   function strcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:425: 
+[eva] FRAMAC_SHARE/libc/string.h:441: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
 [eva] Done for function strcpy
 [eva] Recording results for getaddrinfo
@@ -271,7 +273,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] FRAMAC_SHARE/libc/netdb.c:152: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] computing for function strncpy <- gethostbyname <- main.
   Called from FRAMAC_SHARE/libc/netdb.c:153.
@@ -282,7 +284,7 @@
   function strncpy: precondition 'room_nstring' got status valid.
 [eva] FRAMAC_SHARE/libc/netdb.c:153: 
   function strncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:441: 
+[eva] FRAMAC_SHARE/libc/string.h:457: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
 [eva] Done for function strncpy
 [eva] Recording results for gethostbyname
@@ -334,9 +336,9 @@
   __retres ∈ {{ NULL ; &__fc_ghbn.host }}
 [eva:final-states] Values at end of function main:
   __fc_errno ∈ [--..--]
+  __fc_fds[0..1023] ∈ [--..--]
   __fc_heap_status ∈ [--..--]
   Frama_C_entropy_source ∈ [--..--]
-  __fc_fds[0..1023] ∈ [--..--]
   __fc_sockfds[0..1023] ∈ [--..--]
   __fc_socket_counter ∈ [--..--]
   __fc_ghbn.host.h_name ∈ {{ NULL ; &__fc_ghbn.hostbuf[0] }}
diff --git a/tests/libc/oracle/pwd_c.res.oracle b/tests/libc/oracle/pwd_c.res.oracle
index 1543ddd5c9d..9aee7b05fdb 100644
--- a/tests/libc/oracle/pwd_c.res.oracle
+++ b/tests/libc/oracle/pwd_c.res.oracle
@@ -88,7 +88,7 @@
   function strcpy: precondition 'room_string' got status valid.
 [eva] FRAMAC_SHARE/libc/pwd.c:87: 
   function strcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:425: 
+[eva] FRAMAC_SHARE/libc/string.h:441: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
 [eva] Done for function strcpy
 [eva] FRAMAC_SHARE/libc/pwd.c:88: Call to builtin strlen
diff --git a/tests/libc/oracle/search_h.res.oracle b/tests/libc/oracle/search_h.res.oracle
index bb8778da14a..df0333934a7 100644
--- a/tests/libc/oracle/search_h.res.oracle
+++ b/tests/libc/oracle/search_h.res.oracle
@@ -30,7 +30,7 @@
   function strcpy: precondition 'room_string' got status unknown.
 [eva] search_h.c:31: 
   function strcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:425: 
+[eva] FRAMAC_SHARE/libc/string.h:441: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
 [eva] Done for function strcpy
 [eva:alarm] search_h.c:32: Warning: 
diff --git a/tests/libc/oracle/socket.0.res.oracle b/tests/libc/oracle/socket.0.res.oracle
index a40bbd1511f..de9e0f72d41 100644
--- a/tests/libc/oracle/socket.0.res.oracle
+++ b/tests/libc/oracle/socket.0.res.oracle
@@ -133,7 +133,7 @@
   Called from socket.c:103.
 [eva] using specification for function memset
 [eva] socket.c:103: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Done for function memset
 [eva] computing for function bind <- test_server_echo <- main.
diff --git a/tests/libc/oracle/socket.1.res.oracle b/tests/libc/oracle/socket.1.res.oracle
index 6033f24ffd4..2d2f6878bba 100644
--- a/tests/libc/oracle/socket.1.res.oracle
+++ b/tests/libc/oracle/socket.1.res.oracle
@@ -133,7 +133,7 @@
   Called from socket.c:103.
 [eva] using specification for function memset
 [eva] socket.c:103: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Done for function memset
 [eva] computing for function bind <- test_server_echo <- main.
diff --git a/tests/libc/oracle/stdatomic_c.res.oracle b/tests/libc/oracle/stdatomic_c.res.oracle
index 210a62db4e6..988e502125d 100644
--- a/tests/libc/oracle/stdatomic_c.res.oracle
+++ b/tests/libc/oracle/stdatomic_c.res.oracle
@@ -90,7 +90,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] FRAMAC_SHARE/libc/stdatomic.c:97: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] FRAMAC_SHARE/libc/stdatomic.c:98: Call to builtin memcpy
 [eva] FRAMAC_SHARE/libc/stdatomic.c:98: 
diff --git a/tests/libc/oracle/stdio_h.res.oracle b/tests/libc/oracle/stdio_h.res.oracle
index 473073174b6..f74af6c62a0 100644
--- a/tests/libc/oracle/stdio_h.res.oracle
+++ b/tests/libc/oracle/stdio_h.res.oracle
@@ -206,7 +206,7 @@
 [eva:libc:unsupported-spec] stdio_h.c:99: Warning: 
   The specification of function 'vscanf' is currently not supported by Eva.
   Consider adding 'FRAMAC_SHARE/libc/stdio.c' to the analyzed source files.
-[eva] FRAMAC_SHARE/libc/stdio.h:239: Warning: 
+[eva] FRAMAC_SHARE/libc/stdio.h:276: Warning: 
   no 'assigns \result \from ...' clause specified for function vscanf
 [eva] Done for function vscanf
 [eva] Recording results for caller_stub_for_vscanf
diff --git a/tests/libc/oracle/stdlib_c.2.res.oracle b/tests/libc/oracle/stdlib_c.2.res.oracle
index 2f4cdcf25ec..07dfdf8eecf 100644
--- a/tests/libc/oracle/stdlib_c.2.res.oracle
+++ b/tests/libc/oracle/stdlib_c.2.res.oracle
@@ -13,7 +13,7 @@
 [eva] using specification for function memset
 [eva] FRAMAC_SHARE/libc/stdlib.c:73: 
   function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] Done for function memset
 [eva] Recording results for calloc
diff --git a/tests/libc/oracle/stdlib_c_env.res.oracle b/tests/libc/oracle/stdlib_c_env.res.oracle
index 980661bdbfe..a345521cbb7 100644
--- a/tests/libc/oracle/stdlib_c_env.res.oracle
+++ b/tests/libc/oracle/stdlib_c_env.res.oracle
@@ -9,7 +9,7 @@
 [eva] FRAMAC_SHARE/libc/stdlib.c:118: Call to builtin strchr
 [eva] FRAMAC_SHARE/libc/stdlib.c:118: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:202: 
+[eva] FRAMAC_SHARE/libc/string.h:218: 
   cannot evaluate ACSL term, unsupported logic var p
 [eva] FRAMAC_SHARE/libc/stdlib.c:119: 
   assertion 'string_contains_separator' got status valid.
@@ -109,7 +109,7 @@
   function strcpy: precondition 'room_string' got status valid.
 [eva] stdlib_c_env.c:15: 
   function strcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:425: 
+[eva] FRAMAC_SHARE/libc/string.h:441: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
 [eva] Done for function strcpy
 [eva] computing for function getenv <- main.
diff --git a/tests/libc/oracle/string_c.res.oracle b/tests/libc/oracle/string_c.res.oracle
index 67ca8f2a247..d545003328a 100644
--- a/tests/libc/oracle/string_c.res.oracle
+++ b/tests/libc/oracle/string_c.res.oracle
@@ -13,11 +13,11 @@
 [eva] string_c.c:10: function memcpy: precondition 'valid_src' got status valid.
 [eva] string_c.c:10: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:118: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:134: Warning: 
   function memcpy: postcondition 'copied_contents' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:119: 
+[eva] FRAMAC_SHARE/libc/string.h:135: 
   function memcpy: postcondition 'result_ptr' got status valid.
 [eva] Recording results for memcpy
 [eva] Done for function memcpy
@@ -92,11 +92,11 @@
   function memoverlap, behavior not_separated_gt: postcondition 'result_p_after_q' got status valid.
 [eva] Recording results for memoverlap
 [eva] Done for function memoverlap
-[eva] FRAMAC_SHARE/libc/string.h:141: 
+[eva] FRAMAC_SHARE/libc/string.h:157: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:141: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:157: Warning: 
   function memmove: postcondition 'copied_contents' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:142: 
+[eva] FRAMAC_SHARE/libc/string.h:158: 
   function memmove: postcondition 'result_ptr' got status valid.
 [eva] Recording results for memmove
 [eva] Done for function memmove
@@ -153,7 +153,7 @@
   Called from string_c.c:64.
 [eva] string_c.c:64: 
   function strlen: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:160: 
+[eva] FRAMAC_SHARE/libc/string.h:176: 
   function strlen: postcondition 'acsl_c_equiv' got status valid.
 [eva] Recording results for strlen
 [eva] Done for function strlen
@@ -180,7 +180,7 @@
   Called from string_c.c:75.
 [eva] string_c.c:75: 
   function strnlen: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:166: 
+[eva] FRAMAC_SHARE/libc/string.h:182: 
   function strnlen: postcondition 'result_bounded' got status valid.
 [eva] Recording results for strnlen
 [eva] Done for function strnlen
@@ -227,11 +227,11 @@
 [eva] computing for function memset <- test_memset <- main.
   Called from string_c.c:92.
 [eva] string_c.c:92: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
-[eva:alarm] FRAMAC_SHARE/libc/string.h:151: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:167: Warning: 
   function memset: postcondition 'acsl_c_equiv' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:152: 
+[eva] FRAMAC_SHARE/libc/string.h:168: 
   function memset: postcondition 'result_ptr' got status valid.
 [eva] Recording results for memset
 [eva] Done for function memset
@@ -254,9 +254,9 @@
   function strcmp: precondition 'valid_string_s1' got status valid.
 [eva] string_c.c:104: 
   function strcmp: precondition 'valid_string_s2' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:174: 
+[eva] FRAMAC_SHARE/libc/string.h:190: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:174: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:190: Warning: 
   function strcmp: postcondition 'acsl_c_equiv' got status unknown.
 [eva] Recording results for strcmp
 [eva] Done for function strcmp
@@ -325,9 +325,9 @@
   function strncmp: precondition 'valid_string_s1' got status valid.
 [eva] string_c.c:166: 
   function strncmp: precondition 'valid_string_s2' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:181: 
+[eva] FRAMAC_SHARE/libc/string.h:197: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strncmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:181: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:197: Warning: 
   function strncmp: postcondition 'acsl_c_equiv' got status unknown.
 [eva] Recording results for strncmp
 [eva] Done for function strncmp
@@ -483,13 +483,13 @@
   function strlen: precondition 'valid_string_s' got status valid.
 [eva] Recording results for strlen
 [eva] Done for function strlen
-[eva] FRAMAC_SHARE/libc/string.h:483: 
+[eva] FRAMAC_SHARE/libc/string.h:499: 
   function strcat: postcondition 'sum_of_lengths' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:486: 
+[eva] FRAMAC_SHARE/libc/string.h:502: 
   function strcat: postcondition 'initialization,dest' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:487: 
+[eva] FRAMAC_SHARE/libc/string.h:503: 
   function strcat: postcondition 'dest_null_terminated' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:488: 
+[eva] FRAMAC_SHARE/libc/string.h:504: 
   function strcat: postcondition 'result_ptr' got status valid.
 [eva] Recording results for strcat
 [eva] Done for function strcat
@@ -554,11 +554,11 @@
   function strcpy: precondition 'room_string' got status valid.
 [eva] string_c.c:141: 
   function strcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:425: 
+[eva] FRAMAC_SHARE/libc/string.h:441: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:425: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:441: Warning: 
   function strcpy: postcondition 'equal_contents' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:426: 
+[eva] FRAMAC_SHARE/libc/string.h:442: 
   function strcpy: postcondition 'result_ptr' got status valid.
 [eva] Recording results for strcpy
 [eva] Done for function strcpy
@@ -598,13 +598,13 @@
   function strncpy: precondition 'room_nstring' got status valid.
 [eva] string_c.c:153: 
   function strncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:437: 
+[eva] FRAMAC_SHARE/libc/string.h:453: 
   function strncpy: postcondition 'result_ptr' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:438: 
+[eva] FRAMAC_SHARE/libc/string.h:454: 
   function strncpy: postcondition 'initialization' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:441: 
+[eva] FRAMAC_SHARE/libc/string.h:457: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:441: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:457: Warning: 
   function strncpy, behavior complete: postcondition 'equal_after_copy' got status unknown.
 [eva] Recording results for strncpy
 [eva] Done for function strncpy
@@ -618,9 +618,9 @@
   function strncpy: precondition 'room_nstring' got status valid.
 [eva] string_c.c:156: 
   function strncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:444: 
+[eva] FRAMAC_SHARE/libc/string.h:460: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:444: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:460: Warning: 
   function strncpy, behavior partial: postcondition 'equal_prefix' got status unknown.
 [eva] Recording results for strncpy
 [eva] Done for function strncpy
@@ -655,17 +655,17 @@
   Called from string_c.c:200.
 [eva] string_c.c:200: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:197: 
+[eva] FRAMAC_SHARE/libc/string.h:213: 
   function strchr, behavior found: postcondition 'result_valid_string' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:198: 
+[eva] FRAMAC_SHARE/libc/string.h:214: 
   function strchr, behavior found: postcondition 'result_char' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:199: 
+[eva] FRAMAC_SHARE/libc/string.h:215: 
   function strchr, behavior found: postcondition 'result_same_base' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:200: 
+[eva] FRAMAC_SHARE/libc/string.h:216: 
   function strchr, behavior found: postcondition 'result_in_length' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:202: 
+[eva] FRAMAC_SHARE/libc/string.h:218: 
   cannot evaluate ACSL term, unsupported logic var p
-[eva:alarm] FRAMAC_SHARE/libc/string.h:202: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:218: Warning: 
   function strchr, behavior found: postcondition 'result_first_occurrence' got status unknown.
 [eva] Recording results for strchr
 [eva] Done for function strchr
@@ -674,7 +674,7 @@
   Called from string_c.c:202.
 [eva] string_c.c:202: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:205: 
+[eva] FRAMAC_SHARE/libc/string.h:221: 
   function strchr, behavior not_found: postcondition 'result_null' got status valid.
 [eva] Recording results for strchr
 [eva] Done for function strchr
@@ -707,7 +707,7 @@
   function strlen: precondition 'valid_string_s' got status valid.
 [eva] Recording results for strlen
 [eva] Done for function strlen
-[eva] FRAMAC_SHARE/libc/string.h:223: 
+[eva] FRAMAC_SHARE/libc/string.h:239: 
   function strrchr: postcondition 'result_null_or_same_base' got status valid.
 [eva] Recording results for strrchr
 [eva] Done for function strrchr
@@ -914,9 +914,9 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_c.c:260: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:266: 
+[eva] FRAMAC_SHARE/libc/string.h:282: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:263: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:279: Warning: 
   function strstr: postcondition 'result_null_or_in_haystack' got status unknown.
 [eva] Recording results for strstr
 [eva] Done for function strstr
@@ -936,7 +936,7 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_c.c:264: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:263: 
+[eva] FRAMAC_SHARE/libc/string.h:279: 
   function strstr: postcondition 'result_null_or_in_haystack' got status valid.
 [eva] Recording results for strstr
 [eva] Done for function strstr
@@ -998,12 +998,12 @@
   function mempcpy: precondition 'valid_src' got status valid.
 [eva] string_c.c:281: 
   function mempcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:131: 
+[eva] FRAMAC_SHARE/libc/string.h:147: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:131: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:147: Warning: 
   function mempcpy: postcondition 'copied_contents' got status unknown.
 [kernel] FRAMAC_SHARE/libc/string.c:57: Warning: using size of 'void'
-[eva:alarm] FRAMAC_SHARE/libc/string.h:132: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:148: Warning: 
   function mempcpy: postcondition 'result_next_byte' got status unknown.
 [eva] Recording results for mempcpy
 [eva] Done for function mempcpy
diff --git a/tests/libc/oracle/string_c_generic.res.oracle b/tests/libc/oracle/string_c_generic.res.oracle
index 3ab945c14d0..5f69195fdc5 100644
--- a/tests/libc/oracle/string_c_generic.res.oracle
+++ b/tests/libc/oracle/string_c_generic.res.oracle
@@ -12,11 +12,11 @@
   function strcpy: precondition 'room_string' got status valid.
 [eva] string_c_generic.c:56: 
   function strcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:425: 
+[eva] FRAMAC_SHARE/libc/string.h:441: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:425: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:441: Warning: 
   function strcpy: postcondition 'equal_contents' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:426: 
+[eva] FRAMAC_SHARE/libc/string.h:442: 
   function strcpy: postcondition 'result_ptr' got status valid.
 [eva] Recording results for strcpy
 [eva] Done for function strcpy
@@ -26,9 +26,9 @@
   function strcmp: precondition 'valid_string_s1' got status valid.
 [eva] string_c_generic.c:57: 
   function strcmp: precondition 'valid_string_s2' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:174: 
+[eva] FRAMAC_SHARE/libc/string.h:190: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:174: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:190: Warning: 
   function strcmp: postcondition 'acsl_c_equiv' got status unknown.
 [eva] Recording results for strcmp
 [eva] Done for function strcmp
@@ -144,11 +144,11 @@
   Called from string_c_generic.c:72.
 [eva] string_c_generic.c:72: 
   function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
-[eva:alarm] FRAMAC_SHARE/libc/string.h:151: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:167: Warning: 
   function memset: postcondition 'acsl_c_equiv' got status unknown.
-[eva] FRAMAC_SHARE/libc/string.h:152: 
+[eva] FRAMAC_SHARE/libc/string.h:168: 
   function memset: postcondition 'result_ptr' got status valid.
 [eva] Recording results for memset
 [eva] Done for function memset
@@ -161,13 +161,13 @@
 [eva] string_c_generic.c:73: 
   function strncpy: precondition 'separation' got status valid.
 [eva] FRAMAC_SHARE/libc/string.c:249: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/string.h:437: 
+[eva] FRAMAC_SHARE/libc/string.h:453: 
   function strncpy: postcondition 'result_ptr' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:438: 
+[eva] FRAMAC_SHARE/libc/string.h:454: 
   function strncpy: postcondition 'initialization' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:441: 
+[eva] FRAMAC_SHARE/libc/string.h:457: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:441: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:457: Warning: 
   function strncpy, behavior complete: postcondition 'equal_after_copy' got status unknown.
 [eva] Recording results for strncpy
 [eva] Done for function strncpy
@@ -199,9 +199,9 @@
   function strncpy: precondition 'room_nstring' got status valid.
 [eva] string_c_generic.c:78: 
   function strncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:444: 
+[eva] FRAMAC_SHARE/libc/string.h:460: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:444: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:460: Warning: 
   function strncpy, behavior partial: postcondition 'equal_prefix' got status unknown.
 [eva] Recording results for strncpy
 [eva] Done for function strncpy
@@ -212,9 +212,9 @@
 [eva] string_c_generic.c:82: 
   function strncmp: precondition 'valid_string_s2' got status valid.
 [eva] FRAMAC_SHARE/libc/string.c:154: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/string.h:181: 
+[eva] FRAMAC_SHARE/libc/string.h:197: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strncmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:181: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:197: Warning: 
   function strncmp: postcondition 'acsl_c_equiv' got status unknown.
 [eva] Recording results for strncmp
 [eva] Done for function strncmp
@@ -250,13 +250,13 @@
   Called from FRAMAC_SHARE/libc/string.c:212.
 [eva] FRAMAC_SHARE/libc/string.c:212: 
   function strlen: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:160: 
+[eva] FRAMAC_SHARE/libc/string.h:176: 
   function strlen: postcondition 'acsl_c_equiv' got status valid.
 [eva] Recording results for strlen
 [eva] Done for function strlen
-[eva] FRAMAC_SHARE/libc/string.h:504: 
+[eva] FRAMAC_SHARE/libc/string.h:520: 
   function strncat: postcondition 'result_ptr' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:518: 
+[eva] FRAMAC_SHARE/libc/string.h:534: 
   function strncat, behavior partial: postcondition 'sum_of_bounded_lengths' got status valid.
 [eva] Recording results for strncat
 [eva] Done for function strncat
@@ -282,17 +282,17 @@
   Called from string_c_generic.c:91.
 [eva] string_c_generic.c:91: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:197: 
+[eva] FRAMAC_SHARE/libc/string.h:213: 
   function strchr, behavior found: postcondition 'result_valid_string' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:198: 
+[eva] FRAMAC_SHARE/libc/string.h:214: 
   function strchr, behavior found: postcondition 'result_char' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:199: 
+[eva] FRAMAC_SHARE/libc/string.h:215: 
   function strchr, behavior found: postcondition 'result_same_base' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:200: 
+[eva] FRAMAC_SHARE/libc/string.h:216: 
   function strchr, behavior found: postcondition 'result_in_length' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:202: 
+[eva] FRAMAC_SHARE/libc/string.h:218: 
   cannot evaluate ACSL term, unsupported logic var p
-[eva:alarm] FRAMAC_SHARE/libc/string.h:202: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:218: Warning: 
   function strchr, behavior found: postcondition 'result_first_occurrence' got status unknown.
 [eva] Recording results for strchr
 [eva] Done for function strchr
@@ -300,7 +300,7 @@
   Called from string_c_generic.c:92.
 [eva] string_c_generic.c:92: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:205: 
+[eva] FRAMAC_SHARE/libc/string.h:221: 
   function strchr, behavior not_found: postcondition 'result_null' got status valid.
 [eva] Recording results for strchr
 [eva] Done for function strchr
@@ -314,7 +314,7 @@
   function strlen: precondition 'valid_string_s' got status valid.
 [eva] Recording results for strlen
 [eva] Done for function strlen
-[eva] FRAMAC_SHARE/libc/string.h:223: 
+[eva] FRAMAC_SHARE/libc/string.h:239: 
   function strrchr: postcondition 'result_null_or_same_base' got status valid.
 [eva] Recording results for strrchr
 [eva] Done for function strrchr
diff --git a/tests/libc/oracle/string_c_strchr.res.oracle b/tests/libc/oracle/string_c_strchr.res.oracle
index a453fa14af6..f662ee9b679 100644
--- a/tests/libc/oracle/string_c_strchr.res.oracle
+++ b/tests/libc/oracle/string_c_strchr.res.oracle
@@ -10,7 +10,7 @@
   Called from string_c_strchr.c:62.
 [eva] string_c_strchr.c:62: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:205: 
+[eva] FRAMAC_SHARE/libc/string.h:221: 
   function strchr, behavior not_found: postcondition 'result_null' got status valid.
 [eva] Recording results for strchr
 [eva] Done for function strchr
@@ -56,17 +56,17 @@
   Called from string_c_strchr.c:70.
 [eva] string_c_strchr.c:70: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:197: 
+[eva] FRAMAC_SHARE/libc/string.h:213: 
   function strchr, behavior found: postcondition 'result_valid_string' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:198: 
+[eva] FRAMAC_SHARE/libc/string.h:214: 
   function strchr, behavior found: postcondition 'result_char' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:199: 
+[eva] FRAMAC_SHARE/libc/string.h:215: 
   function strchr, behavior found: postcondition 'result_same_base' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:200: 
+[eva] FRAMAC_SHARE/libc/string.h:216: 
   function strchr, behavior found: postcondition 'result_in_length' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:202: 
+[eva] FRAMAC_SHARE/libc/string.h:218: 
   cannot evaluate ACSL term, unsupported logic var p
-[eva:alarm] FRAMAC_SHARE/libc/string.h:202: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:218: Warning: 
   function strchr, behavior found: postcondition 'result_first_occurrence' got status unknown.
 [eva] Recording results for strchr
 [eva] Done for function strchr
diff --git a/tests/libc/oracle/string_c_strstr.res.oracle b/tests/libc/oracle/string_c_strstr.res.oracle
index 4d8bf67212f..8fd087fb990 100644
--- a/tests/libc/oracle/string_c_strstr.res.oracle
+++ b/tests/libc/oracle/string_c_strstr.res.oracle
@@ -10,7 +10,7 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_c_strstr.c:52: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:263: 
+[eva] FRAMAC_SHARE/libc/string.h:279: 
   function strstr: postcondition 'result_null_or_in_haystack' got status valid.
 [eva] Recording results for strstr
 [eva] Done for function strstr
@@ -68,7 +68,7 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_c_strstr.c:59: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:295: starting to merge loop iterations
+[eva] FRAMAC_SHARE/libc/string.c:306: starting to merge loop iterations
 [eva] Recording results for strstr
 [eva] Done for function strstr
 [eva] computing for function strstr <- main.
@@ -101,9 +101,9 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_c_strstr.c:64: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:266: 
+[eva] FRAMAC_SHARE/libc/string.h:282: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
-[eva:alarm] FRAMAC_SHARE/libc/string.h:263: Warning: 
+[eva:alarm] FRAMAC_SHARE/libc/string.h:279: Warning: 
   function strstr: postcondition 'result_null_or_in_haystack' got status unknown.
 [eva] Recording results for strstr
 [eva] Done for function strstr
diff --git a/tests/libc/oracle/string_h.res.oracle b/tests/libc/oracle/string_h.res.oracle
index 2b9a24d5ee7..098a1f4c9ae 100644
--- a/tests/libc/oracle/string_h.res.oracle
+++ b/tests/libc/oracle/string_h.res.oracle
@@ -13,7 +13,7 @@
   function strcmp: precondition 'valid_string_s1' got status valid.
 [eva] string_h.c:5: 
   function strcmp: precondition 'valid_string_s2' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:174: 
+[eva] FRAMAC_SHARE/libc/string.h:190: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
 [eva] Done for function strcmp
 [eva:alarm] string_h.c:6: Warning: check got status unknown.
@@ -55,7 +55,7 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_h.c:24: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:266: 
+[eva] FRAMAC_SHARE/libc/string.h:282: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] Done for function strstr
 [eva:alarm] string_h.c:25: Warning: check got status unknown.
@@ -402,7 +402,7 @@
 [eva] string_h.c:173: Call to builtin strchr
 [eva] string_h.c:173: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:202: 
+[eva] FRAMAC_SHARE/libc/string.h:218: 
   cannot evaluate ACSL term, unsupported logic var p
 [eva:alarm] string_h.c:173: Warning: check got status unknown.
 [eva] computing for function strchrnul <- main.
@@ -428,7 +428,7 @@
   function mempcpy: precondition 'valid_src' got status valid.
 [eva] string_h.c:179: 
   function mempcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:131: 
+[eva] FRAMAC_SHARE/libc/string.h:147: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [kernel] string_h.c:179: Warning: using size of 'void'
 [eva] Done for function mempcpy
@@ -514,7 +514,7 @@
   function stpncpy: precondition 'valid_dest' got status valid.
 [eva] string_h.c:209: 
   function stpncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:627: 
+[eva] FRAMAC_SHARE/libc/string.h:643: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strncmp
 [eva] Done for function stpncpy
 [eva] string_h.c:210: check got status valid.
@@ -527,7 +527,7 @@
   function stpncpy: precondition 'valid_dest' got status valid.
 [eva] string_h.c:213: 
   function stpncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:621: 
+[eva] FRAMAC_SHARE/libc/string.h:637: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strcmp
 [eva] Done for function stpncpy
 [eva:alarm] string_h.c:214: Warning: check got status unknown.
diff --git a/tests/libc/oracle/sys_select.res.oracle b/tests/libc/oracle/sys_select.res.oracle
index 17aef2c88e1..1de303ea58f 100644
--- a/tests/libc/oracle/sys_select.res.oracle
+++ b/tests/libc/oracle/sys_select.res.oracle
@@ -10,7 +10,7 @@
 [eva] Done for function socket
 [eva] sys_select.c:16: Call to builtin memset
 [eva] sys_select.c:16: function memset: precondition 'valid_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:151: 
+[eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
 [eva] computing for function htonl <- main.
   Called from sys_select.c:18.
@@ -56,7 +56,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] sys_select.c:30: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] computing for function select <- main.
   Called from sys_select.c:31.
diff --git a/tests/libc/oracle/sys_stat_h.res.oracle b/tests/libc/oracle/sys_stat_h.res.oracle
index 9b3ca1d4173..2be1050561e 100644
--- a/tests/libc/oracle/sys_stat_h.res.oracle
+++ b/tests/libc/oracle/sys_stat_h.res.oracle
@@ -109,8 +109,8 @@
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
-  __fc_errno ∈ [--..--]
   __fc_fds[0..1023] ∈ [--..--]
+  __fc_errno ∈ [--..--]
   fd ∈ [-1..1023]
   st ∈ [--..--] or UNINITIALIZED
   r ∈ {-1; 0} or UNINITIALIZED
diff --git a/tests/libc/oracle/sys_time_h.res.oracle b/tests/libc/oracle/sys_time_h.res.oracle
index 53e9764e7d6..5cf6085db28 100644
--- a/tests/libc/oracle/sys_time_h.res.oracle
+++ b/tests/libc/oracle/sys_time_h.res.oracle
@@ -53,6 +53,8 @@
   function utimes: precondition 'valid_path' got status valid.
 [eva] sys_time_h.c:22: 
   function utimes: precondition 'valid_times_or_null' got status valid.
+[eva] sys_time_h.c:22: 
+  function utimes: precondition 'intialized_times_or_null,initialization' got status valid.
 [eva] Done for function utimes
 [eva] computing for function utimes <- main.
   Called from sys_time_h.c:28.
@@ -60,6 +62,8 @@
   function utimes: precondition 'valid_path' got status valid.
 [eva] sys_time_h.c:28: 
   function utimes: precondition 'valid_times_or_null' got status valid.
+[eva] sys_time_h.c:28: 
+  function utimes: precondition 'intialized_times_or_null,initialization' got status valid.
 [eva] Done for function utimes
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/metrics/oracle/libc.json b/tests/metrics/oracle/libc.json
index ffe85949926..d84a6dcc80a 100644
--- a/tests/metrics/oracle/libc.json
+++ b/tests/metrics/oracle/libc.json
@@ -9,6 +9,13 @@
     { "main": { "calls": 0, "address_taken": false } }
   ],
   "specified-only-functions": [
+    { "__va_fcntl_flock": { "calls": 0, "address_taken": false } },
+    { "__va_fcntl_int": { "calls": 0, "address_taken": false } },
+    { "__va_fcntl_void": { "calls": 0, "address_taken": false } },
+    { "__va_open_mode_t": { "calls": 0, "address_taken": false } },
+    { "__va_open_void": { "calls": 0, "address_taken": false } },
+    { "__va_openat_mode_t": { "calls": 0, "address_taken": false } },
+    { "__va_openat_void": { "calls": 0, "address_taken": false } },
     { "_exit": { "calls": 0, "address_taken": false } },
     { "access": { "calls": 0, "address_taken": false } },
     { "asprintf": { "calls": 0, "address_taken": false } },
@@ -18,15 +25,19 @@
     { "clearerr": { "calls": 0, "address_taken": false } },
     { "clearerr_unlocked": { "calls": 0, "address_taken": false } },
     { "close": { "calls": 0, "address_taken": false } },
+    { "creat": { "calls": 0, "address_taken": false } },
     { "dup": { "calls": 0, "address_taken": false } },
     { "dup2": { "calls": 0, "address_taken": false } },
+    { "euidaccess": { "calls": 0, "address_taken": false } },
     { "execl": { "calls": 0, "address_taken": false } },
     { "execle": { "calls": 0, "address_taken": false } },
     { "execlp": { "calls": 0, "address_taken": false } },
     { "execv": { "calls": 0, "address_taken": false } },
     { "execve": { "calls": 0, "address_taken": false } },
     { "execvp": { "calls": 0, "address_taken": false } },
+    { "faccessat": { "calls": 0, "address_taken": false } },
     { "fclose": { "calls": 0, "address_taken": false } },
+    { "fcntl": { "calls": 0, "address_taken": false } },
     { "fdopen": { "calls": 0, "address_taken": false } },
     { "feof": { "calls": 0, "address_taken": false } },
     { "feof_unlocked": { "calls": 0, "address_taken": false } },
@@ -59,6 +70,7 @@
     { "getchar": { "calls": 1, "address_taken": false } },
     { "getchar_unlocked": { "calls": 0, "address_taken": false } },
     { "getcwd": { "calls": 0, "address_taken": false } },
+    { "getdelim": { "calls": 0, "address_taken": false } },
     { "getegid": { "calls": 0, "address_taken": false } },
     { "geteuid": { "calls": 0, "address_taken": false } },
     { "getgid": { "calls": 0, "address_taken": false } },
@@ -91,6 +103,8 @@
     { "isxdigit": { "calls": 0, "address_taken": false } },
     { "link": { "calls": 0, "address_taken": false } },
     { "lseek": { "calls": 0, "address_taken": false } },
+    { "open": { "calls": 0, "address_taken": false } },
+    { "openat": { "calls": 0, "address_taken": false } },
     { "pathconf": { "calls": 0, "address_taken": false } },
     { "pclose": { "calls": 0, "address_taken": false } },
     { "perror": { "calls": 0, "address_taken": false } },
@@ -104,6 +118,8 @@
     { "read": { "calls": 0, "address_taken": false } },
     { "remove": { "calls": 0, "address_taken": false } },
     { "rename": { "calls": 0, "address_taken": false } },
+    { "renameat": { "calls": 0, "address_taken": false } },
+    { "renameat2": { "calls": 0, "address_taken": false } },
     { "rewind": { "calls": 0, "address_taken": false } },
     { "rmdir": { "calls": 0, "address_taken": false } },
     { "setbuf": { "calls": 0, "address_taken": false } },
diff --git a/tests/rte/oracle/value_rte.res.oracle b/tests/rte/oracle/value_rte.res.oracle
index ff65907c996..b89b879da84 100644
--- a/tests/rte/oracle/value_rte.res.oracle
+++ b/tests/rte/oracle/value_rte.res.oracle
@@ -157,7 +157,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 76)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 78)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -170,7 +170,33 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 85)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 87)
+            Unverifiable but considered Valid.
+[  Valid  ] Default behavior
+            by Frama-C kernel.
+
+--------------------------------------------------------------------------------
+--- Properties of Function 'renameat'
+--------------------------------------------------------------------------------
+
+[ Extern  ] Post-condition 'result_ok_or_error'
+            Unverifiable but considered Valid.
+[ Extern  ] Assigns nothing
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 101)
+            Unverifiable but considered Valid.
+[  Valid  ] Default behavior
+            by Frama-C kernel.
+
+--------------------------------------------------------------------------------
+--- Properties of Function 'renameat2'
+--------------------------------------------------------------------------------
+
+[ Extern  ] Post-condition 'result_ok_or_error'
+            Unverifiable but considered Valid.
+[ Extern  ] Assigns nothing
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 119)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -183,7 +209,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 95)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 132)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -194,13 +220,13 @@
 
 [ Extern  ] Post-condition 'result_string_or_null'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 109)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 146)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 109)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 146)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 111)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 148)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 112)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 149)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -213,7 +239,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 121)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 158)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -224,25 +250,25 @@
 
 [ Extern  ] Post-condition 'result_zero_or_EOF'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 130)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 167)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 137)
+[ Extern  ] Assigns for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 174)
             Unverifiable but considered Valid.
-[ Extern  ] Assigns for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 142)
+[ Extern  ] Assigns for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 179)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 130)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 167)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 132)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 169)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 132)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 169)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 137)
+[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 174)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 139)
+[ Extern  ] Froms for 'flush_all' (file FRAMAC_SHARE/libc/stdio.h, line 176)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 142)
+[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 179)
             Unverifiable but considered Valid.
-[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 143)
+[ Extern  ] Froms for 'flush_stream' (file FRAMAC_SHARE/libc/stdio.h, line 180)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -259,7 +285,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 152)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 189)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -270,11 +296,11 @@
 
 [ Extern  ] Post-condition 'result_null_or_valid_fd'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 162)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 199)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 162)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 199)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 162)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 199)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -287,11 +313,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'stream_opened'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 174)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 211)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 174)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 211)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 176)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 213)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -300,9 +326,9 @@
 --- Properties of Function 'setbuf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 187)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 224)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 187)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 224)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -311,9 +337,9 @@
 --- Properties of Function 'setvbuf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 191)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 228)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 191)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 228)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -322,11 +348,11 @@
 --- Properties of Function 'vfprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 220)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 257)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 220)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 257)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 221)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 258)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -335,9 +361,9 @@
 --- Properties of Function 'vfscanf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 227)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 264)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 227)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 264)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -346,9 +372,9 @@
 --- Properties of Function 'vprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 233)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 270)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 233)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 270)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -357,9 +383,9 @@
 --- Properties of Function 'vscanf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 237)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 274)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 237)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 274)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -368,9 +394,9 @@
 --- Properties of Function 'vsnprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 242)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 279)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 242)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 279)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -379,9 +405,9 @@
 --- Properties of Function 'vsprintf'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 248)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 285)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 248)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 285)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -392,11 +418,11 @@
 
 [ Extern  ] Post-condition 'result_uchar_or_eof'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 261)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 298)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 261)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 298)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 262)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 299)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -411,11 +437,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'terminated_string_on_success'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 270)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 307)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 270)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 307)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 271)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 308)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -424,11 +450,11 @@
 --- Properties of Function 'fputc'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 284)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 321)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 284)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 321)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 285)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 322)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -437,11 +463,11 @@
 --- Properties of Function 'fputs'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 291)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 328)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 291)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 328)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 292)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 329)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -450,11 +476,11 @@
 --- Properties of Function 'getc'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 299)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 336)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 299)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 336)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 299)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 336)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -463,11 +489,11 @@
 --- Properties of Function 'getchar'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 304)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 341)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 304)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 341)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 304)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 341)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -478,13 +504,13 @@
 
 [ Extern  ] Post-condition 'result_null_or_same'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 317)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 354)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 317)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 354)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 318)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 355)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 319)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 356)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -493,11 +519,11 @@
 --- Properties of Function 'putc'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 326)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 363)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 326)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 363)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 327)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 364)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -506,11 +532,11 @@
 --- Properties of Function 'putchar'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 332)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 369)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 332)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 369)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 333)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 370)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -519,11 +545,11 @@
 --- Properties of Function 'puts'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 339)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 376)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 339)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 376)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 340)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 377)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -534,11 +560,11 @@
 
 [ Extern  ] Post-condition 'result_ok_or_error'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 346)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 383)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 346)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 383)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 347)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 384)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -551,13 +577,13 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'initialization'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 355)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 392)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 355)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 392)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 355)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 392)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 357)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 394)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -568,11 +594,11 @@
 
 [ Extern  ] Post-condition 'size_written'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 368)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 405)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 368)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 405)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 368)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 405)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -583,11 +609,11 @@
 
 [ Extern  ] Post-condition 'initialization,pos'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 379)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 416)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 379)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 416)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 379)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 416)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -598,13 +624,13 @@
 
 [ Extern  ] Post-condition 'errno_set'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 388)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 425)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 388)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 425)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 389)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 426)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 389)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 426)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -615,13 +641,13 @@
 
 [ Extern  ] Post-condition 'errno_set'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 399)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 436)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 399)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 436)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 400)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 437)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 400)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 437)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -632,13 +658,13 @@
 
 [ Extern  ] Post-condition 'errno_set'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 411)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 448)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 411)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 448)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 412)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 449)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 413)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 450)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -651,11 +677,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'errno_set'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 421)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 458)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 421)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 458)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 421)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 458)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -668,11 +694,11 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'errno_set'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 430)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 467)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 430)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 467)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 430)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 467)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -681,9 +707,9 @@
 --- Properties of Function 'rewind'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 439)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 476)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 439)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 476)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -692,9 +718,9 @@
 --- Properties of Function 'clearerr'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 445)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 482)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 445)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 482)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -705,7 +731,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 451)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 488)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -716,7 +742,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 457)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 494)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -725,9 +751,9 @@
 --- Properties of Function 'flockfile'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 463)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 500)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 463)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 500)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -736,9 +762,9 @@
 --- Properties of Function 'funlockfile'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 469)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 506)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 469)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 506)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -747,11 +773,11 @@
 --- Properties of Function 'ftrylockfile'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 475)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 512)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 475)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 512)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 475)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 512)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -762,7 +788,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 481)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 518)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -771,9 +797,9 @@
 --- Properties of Function 'perror'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 487)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 524)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 487)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 524)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -782,11 +808,11 @@
 --- Properties of Function 'getc_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 493)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 530)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 493)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 530)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 493)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 530)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -797,7 +823,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 498)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 535)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -806,11 +832,11 @@
 --- Properties of Function 'putc_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 504)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 541)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 504)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 541)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 505)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 542)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -819,11 +845,11 @@
 --- Properties of Function 'putchar_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 510)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 547)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 510)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 547)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 511)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 548)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -832,9 +858,9 @@
 --- Properties of Function 'clearerr_unlocked'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 517)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 554)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 517)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 554)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -845,7 +871,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 523)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 560)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -856,7 +882,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 529)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 566)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -867,7 +893,7 @@
 
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 535)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 572)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -878,11 +904,11 @@
 
 [ Extern  ] Post-condition 'result_error_or_valid_open_pipe'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 562)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 599)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 562)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 599)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 564)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 601)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -895,7 +921,7 @@
             Unverifiable but considered Valid.
 [ Extern  ] Assigns nothing
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 576)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 613)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -904,15 +930,32 @@
 --- Properties of Function 'getline'
 --------------------------------------------------------------------------------
 
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 621)
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
+            Unverifiable but considered Valid.
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 621)
+            Unverifiable but considered Valid.
+[  Valid  ] Default behavior
+            by Frama-C kernel.
+
+--------------------------------------------------------------------------------
+--- Properties of Function 'getdelim'
+--------------------------------------------------------------------------------
+
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 623)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 584)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 623)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
@@ -925,15 +968,15 @@
             Unverifiable but considered Valid.
 [ Extern  ] Post-condition 'errno_set'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 593)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 632)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 593)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 632)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 595)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 634)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 592) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 631) 
             Unverifiable but considered Valid.
 
 --------------------------------------------------------------------------------
@@ -942,17 +985,17 @@
 
 [ Extern  ] Post-condition 'result_error_or_written_bytes'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 614)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 653)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 614)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 653)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 615)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 654)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 616)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 655)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 613) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 652) 
             Unverifiable but considered Valid.
 
 --------------------------------------------------------------------------------
@@ -961,17 +1004,17 @@
 
 [ Extern  ] Post-condition 'result_error_or_written_bytes'
             Unverifiable but considered Valid.
-[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 627)
+[ Extern  ] Assigns (file FRAMAC_SHARE/libc/stdio.h, line 666)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 627)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 666)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 629)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 668)
             Unverifiable but considered Valid.
-[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 630)
+[ Extern  ] Froms (file FRAMAC_SHARE/libc/stdio.h, line 669)
             Unverifiable but considered Valid.
 [  Valid  ] Default behavior
             by Frama-C kernel.
-[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 626) 
+[ Extern  ] Frees/Allocates nothing/(file FRAMAC_SHARE/libc/stdio.h, line 665) 
             Unverifiable but considered Valid.
 
 --------------------------------------------------------------------------------
@@ -988,8 +1031,8 @@
 --------------------------------------------------------------------------------
 --- Status Report Summary
 --------------------------------------------------------------------------------
-    79 Completely validated
-   239 Considered valid
+    82 Completely validated
+   250 Considered valid
      1 To be validated
-   319 Total
+   333 Total
 --------------------------------------------------------------------------------
diff --git a/tests/syntax/oracle/gnu-asm-aesni.res.oracle b/tests/syntax/oracle/gnu-asm-aesni.res.oracle
index b376a0b1bd9..40d08601f2e 100644
--- a/tests/syntax/oracle/gnu-asm-aesni.res.oracle
+++ b/tests/syntax/oracle/gnu-asm-aesni.res.oracle
@@ -8,7 +8,7 @@
 #include "string.h"
 #include "strings.h"
 typedef unsigned short byte;
-union __anonunion_PROPERLY_ALIGNED_TYPE_1 {
+union __anonunion_PROPERLY_ALIGNED_TYPE_2 {
    int a ;
    short b ;
    char c[1] ;
@@ -16,23 +16,23 @@ union __anonunion_PROPERLY_ALIGNED_TYPE_1 {
    float f ;
    double g ;
 };
-typedef union __anonunion_PROPERLY_ALIGNED_TYPE_1 PROPERLY_ALIGNED_TYPE;
-union __anonunion_u1_3 {
+typedef union __anonunion_PROPERLY_ALIGNED_TYPE_2 PROPERLY_ALIGNED_TYPE;
+union __anonunion_u1_4 {
    PROPERLY_ALIGNED_TYPE dummy ;
    byte keyschedule[14 + 1][4][4] ;
 };
-union __anonunion_u2_4 {
+union __anonunion_u2_5 {
    PROPERLY_ALIGNED_TYPE dummy ;
    byte keyschedule[14 + 1][4][4] ;
 };
-struct __anonstruct_RIJNDAEL_context_2 {
-   union __anonunion_u1_3 u1 ;
-   union __anonunion_u2_4 u2 ;
+struct __anonstruct_RIJNDAEL_context_3 {
+   union __anonunion_u1_4 u1 ;
+   union __anonunion_u2_5 u2 ;
    int rounds ;
    unsigned int decryption_prepared : 1 ;
    unsigned int use_aesni : 1 ;
 };
-typedef struct __anonstruct_RIJNDAEL_context_2 RIJNDAEL_context;
+typedef struct __anonstruct_RIJNDAEL_context_3 RIJNDAEL_context;
 __inline static void do_aesni_enc(RIJNDAEL_context const *ctx,
                                   unsigned char *b, unsigned char const *a)
 {
diff --git a/tests/value/oracle/empty_struct2.res.oracle b/tests/value/oracle/empty_struct2.res.oracle
index a2215f48611..99a1159b0af 100644
--- a/tests/value/oracle/empty_struct2.res.oracle
+++ b/tests/value/oracle/empty_struct2.res.oracle
@@ -15,7 +15,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] empty_struct2.c:52: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] empty_struct2.c:57: Call to builtin memcpy
 [eva] empty_struct2.c:57: 
diff --git a/tests/value/oracle/empty_union.res.oracle b/tests/value/oracle/empty_union.res.oracle
index 81933e68034..b6b85466d53 100644
--- a/tests/value/oracle/empty_union.res.oracle
+++ b/tests/value/oracle/empty_union.res.oracle
@@ -22,7 +22,7 @@
   function memcpy: precondition 'valid_src' got status valid.
 [eva] empty_union.c:72: 
   function memcpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.h:118: 
+[eva] FRAMAC_SHARE/libc/string.h:134: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memcmp
 [eva] empty_union.c:77: Call to builtin memcpy
 [eva] empty_union.c:77: 
-- 
GitLab