From 7b8d5fc2c52c0afd8c4945cb9a884590bf58e1d9 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 27 Jul 2021 21:51:42 +0200 Subject: [PATCH] src/file_wld.c: improve Frama-C annotations --- src/file_wld.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/file_wld.c b/src/file_wld.c index 95461fc1..63a076af 100644 --- a/src/file_wld.c +++ b/src/file_wld.c @@ -32,7 +32,7 @@ #include "filegen.h" #include "common.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_wld(file_stat_t *file_stat); const file_hint_t file_hint_wld = { @@ -47,9 +47,9 @@ const file_hint_t file_hint_wld = { /* See http://ludwig.schafer.free.fr for WLD file format */ /*@ - @ requires \valid(file_recovery); - @ requires valid_file_recovery(file_recovery); @ requires file_recovery->file_rename==&file_rename_wld; + @ requires valid_file_rename_param(file_recovery); + @ ensures valid_file_rename_result(file_recovery); @*/ static void file_rename_wld(file_recovery_t *file_recovery) { @@ -69,12 +69,9 @@ static void file_rename_wld(file_recovery_t *file_recovery) /*@ @ requires buffer_size >= 0xc; - @ 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_wld, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result!=0 ==> valid_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; @*/ static int header_check_wld(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)