src/file_ext2.c: improve Frama-C annotations

This commit is contained in:
Christophe Grenier 2021-06-10 12:15:16 +02:00
parent 3a18ec1bec
commit 7c62ec1682

View file

@ -33,7 +33,7 @@
#include "ext2_common.h" #include "ext2_common.h"
#include "filegen.h" #include "filegen.h"
/*@ requires \valid(file_stat); */ /*@ requires valid_register_header_check(file_stat); */
static void register_header_check_ext2_fs(file_stat_t *file_stat); static void register_header_check_ext2_fs(file_stat_t *file_stat);
const file_hint_t file_hint_ext2_fs= { const file_hint_t file_hint_ext2_fs= {
@ -47,13 +47,9 @@ const file_hint_t file_hint_ext2_fs= {
/*@ /*@
@ requires buffer_size >= sizeof(struct ext2_super_block); @ requires buffer_size >= sizeof(struct ext2_super_block);
@ 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_ext2_fs, buffer+(..), file_recovery, file_recovery_new); @ requires separation: \separated(&file_hint_ext2_fs, buffer+(..), file_recovery, file_recovery_new);
@ ensures \result == 0 || \result == 1; @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new);
@ ensures \result!=0 ==> valid_file_recovery(file_recovery_new); @ ensures valid_header_check_result(\result, file_recovery_new);
@*/ @*/
static int header_check_ext2_fs(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_ext2_fs(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)
{ {