src/file_vmg.c: improve Frama-C annotations

This commit is contained in:
Christophe Grenier 2021-07-27 19:05:13 +02:00
parent 7d816e43eb
commit dac63a1e98

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_vmg(file_stat_t *file_stat); static void register_header_check_vmg(file_stat_t *file_stat);
const file_hint_t file_hint_vmg = { const file_hint_t file_hint_vmg = {
@ -44,11 +44,9 @@ const file_hint_t file_hint_vmg = {
}; };
/*@ /*@
@ requires \valid(file_recovery);
@ requires valid_file_recovery(file_recovery);
@ requires \separated(file_recovery, file_recovery->handle, file_recovery->extension, &errno, &Frama_C_entropy_source);
@ requires file_recovery->file_check == &file_check_vmg; @ requires file_recovery->file_check == &file_check_vmg;
@ ensures \valid(file_recovery->handle); @ requires valid_file_check_param(file_recovery);
@ ensures valid_file_check_result(file_recovery);
@ assigns *file_recovery->handle, errno, file_recovery->file_size; @ assigns *file_recovery->handle, errno, file_recovery->file_size;
@ assigns Frama_C_entropy_source; @ assigns Frama_C_entropy_source;
@*/ @*/
@ -63,13 +61,9 @@ static void file_check_vmg(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_vmg, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_vmg, 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; @ assigns *file_recovery_new;
@*/ @*/
static int header_check_vmg(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_vmg(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)