From 73d11d1d19c6edcf9c52a5a9975a18b6e699102b Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 6 Jun 2021 16:26:26 +0200 Subject: [PATCH] src/file_cpi.c: improve Frama-C annotations --- src/file_cpi.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/file_cpi.c b/src/file_cpi.c index b90132b3..c53b865e 100644 --- a/src/file_cpi.c +++ b/src/file_cpi.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_cpi(file_stat_t *file_stat); const file_hint_t file_hint_cpi= { @@ -44,15 +44,10 @@ const file_hint_t file_hint_cpi= { }; /*@ - @ requires buffer_size > 0; - @ 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_cpi, 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_cpi(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) {