From fc464a44f84b06a8e17fc7d1e76d9c998ca73d5c Mon Sep 17 00:00:00 2001 From: Christophe Grenier Date: Wed, 28 Jul 2021 22:11:08 +0200 Subject: [PATCH] src/file_xml.c: improve Frama-C annotations --- src/file_xml.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/file_xml.c b/src/file_xml.c index 33bc51f8..c832b990 100644 --- a/src/file_xml.c +++ b/src/file_xml.c @@ -32,7 +32,7 @@ #include "filegen.h" #include "log.h" -/*@ requires \valid(file_stat); */ +/*@ requires valid_register_header_check(file_stat); */ static void register_header_check_xml(file_stat_t *file_stat); const file_hint_t file_hint_xml = { @@ -45,9 +45,9 @@ const file_hint_t file_hint_xml = { }; /*@ - @ requires \valid(file_recovery); - @ requires valid_read_string((char*)&file_recovery->filename); @ requires file_recovery->file_rename==&file_rename_xml; + @ requires valid_file_rename_param(file_recovery); + @ ensures valid_file_rename_result(file_recovery); @*/ static void file_rename_xml(file_recovery_t *file_recovery) { @@ -93,13 +93,9 @@ static void file_rename_xml(file_recovery_t *file_recovery) } /*@ - @ 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_xml, 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_xml(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)