src/file_pzh.c: improve Frama-C annotations

This commit is contained in:
Christophe Grenier 2021-07-07 17:58:03 +02:00
parent 8fe30a4af4
commit 8d6bb0f28c

View file

@ -31,7 +31,7 @@
#include "types.h" #include "types.h"
#include "filegen.h" #include "filegen.h"
/*@ requires \valid(file_stat); */ /*@ requires valid_register_header_check(file_stat); */
static void register_header_check_pzh(file_stat_t *file_stat); static void register_header_check_pzh(file_stat_t *file_stat);
/* Presto http://www.soft.es/ */ /* Presto http://www.soft.es/ */
@ -51,9 +51,9 @@ static const unsigned char pzh_header[10]= {
}; };
/*@ /*@
@ requires \valid(file_recovery);
@ requires valid_read_string((char*)&file_recovery->filename);
@ requires file_recovery->file_rename==&file_rename_pzh; @ requires file_recovery->file_rename==&file_rename_pzh;
@ requires valid_file_rename_param(file_recovery);
@ ensures valid_file_rename_result(file_recovery);
@*/ @*/
static void file_rename_pzh(file_recovery_t *file_recovery) static void file_rename_pzh(file_recovery_t *file_recovery)
{ {
@ -74,14 +74,10 @@ static void file_rename_pzh(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_pzh, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_pzh, 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; @ assigns *file_recovery_new;
@ ensures \result!=0 ==> valid_file_recovery(file_recovery_new);
@*/ @*/
static int header_check_pzh(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_pzh(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)
{ {