From e0a2c208e934a96757e093dca0fc26fca5322298 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Thu, 3 Jun 2021 14:01:05 +0200 Subject: [PATCH] src/file_a.c: Update Frama-C annotations --- src/file_a.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/file_a.c b/src/file_a.c index ee1dfbdc..c67c4fbf 100644 --- a/src/file_a.c +++ b/src/file_a.c @@ -31,7 +31,7 @@ #include "types.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_a(file_stat_t *file_stat); const file_hint_t file_hint_a= { @@ -56,14 +56,10 @@ struct file_header /*@ @ requires buffer_size >= 8 + sizeof(struct file_header); - @ requires \valid_read(buffer+(0 .. buffer_size-1)); - @ requires valid_file_recovery(file_recovery); - @ requires \valid(file_recovery_new); - @ requires file_recovery_new->blocksize > 0; @ requires separation: \separated(&file_hint_a, buffer+(..), file_recovery, file_recovery_new); + @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new); + @ ensures valid_header_check_result(\result, file_recovery_new); @ assigns *file_recovery_new; - @ ensures \result == 0 || \result == 1; - @ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @*/ static int header_check_a(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new) {