From 246c44f2d3dff55de18087e1d91fa537206d20d0 Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Tue, 22 Jun 2021 13:34:16 +0200 Subject: [PATCH] src/file_ibd.c: improve Frama-C annotations --- src/file_ibd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/file_ibd.c b/src/file_ibd.c index 964fa028..7bf32b03 100644 --- a/src/file_ibd.c +++ b/src/file_ibd.c @@ -33,7 +33,7 @@ #include "common.h" #include "log.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_ibd(file_stat_t *file_stat); const file_hint_t file_hint_ibd= { @@ -73,13 +73,9 @@ struct innodb_fil_header /*@ @ requires buffer_size >= sizeof(struct innodb_fil_header); @ requires buffer_size > FSP_HEADER_OFFSET + FSP_SPACE_FLAGS; - @ 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_ibd, buffer+(..), file_recovery, file_recovery_new); - @ ensures \result == 0 || \result == 1; - @ 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_ibd(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)