From 10470b2863f210b22fd040319e6271c807e433dc Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Sun, 6 Jun 2021 11:32:05 +0200 Subject: [PATCH] src/file_apa.c: Improve Frama-C annotations --- src/file_apa.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/file_apa.c b/src/file_apa.c index d9e140c8..2d3d86d6 100644 --- a/src/file_apa.c +++ b/src/file_apa.c @@ -32,7 +32,7 @@ #include "common.h" #include "filegen.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_apa(file_stat_t *file_stat); const file_hint_t file_hint_apa= { @@ -46,15 +46,12 @@ const file_hint_t file_hint_apa= { /*@ @ requires buffer_size >= 11+13; - @ 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_apa, 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_apa(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) + @*/ +static int header_check_apa(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) { reset_file_recovery(file_recovery_new); file_recovery_new->extension=file_hint_apa.extension;