luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New prototype for test_btrfs()

Browse source
This commit is contained in:
Christophe Grenier 2016-01-23 09:42:39 +01:00
parent 8450d14b20
commit 373a7ce36d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/btrfs.c
View file

@ -37,10 +37,11 @@
#include "log.h" #include "log.h"
#include "guid_cpy.h" #include "guid_cpy.h"
static int test_btrfs(const struct btrfs_super_block *sb, partition_t *partition); static int test_btrfs(const struct btrfs_super_block *sb);
static int set_btrfs_info(const struct btrfs_super_block *sb, partition_t *partition) static void set_btrfs_info(const struct btrfs_super_block *sb, partition_t *partition)
{ {
partition->upart_type=UP_BTRFS;
partition->blocksize=le32(sb->dev_item.sector_size); partition->blocksize=le32(sb->dev_item.sector_size);
set_part_name(partition, sb->label, sizeof(sb->label)); set_part_name(partition, sb->label, sizeof(sb->label));
snprintf(partition->info, sizeof(partition->info), "btrfs blocksize=%u", partition->blocksize); snprintf(partition->info, sizeof(partition->info), "btrfs blocksize=%u", partition->blocksize);
@ -49,7 +50,6 @@ static int set_btrfs_info(const struct btrfs_super_block *sb, partition_t *parti
strcat(partition->info," Backup superblock"); strcat(partition->info," Backup superblock");
} }
/* last mounted => date */ /* last mounted => date */
return 0;
} }
int check_btrfs(disk_t *disk_car,partition_t *partition) int check_btrfs(disk_t *disk_car,partition_t *partition)
@ -60,7 +60,7 @@ int check_btrfs(disk_t *disk_car,partition_t *partition)
free(buffer); free(buffer);
return 1; return 1;
} }
if(test_btrfs((struct btrfs_super_block*)buffer, partition)!=0) if(test_btrfs((struct btrfs_super_block*)buffer)!=0)
{ {
free(buffer); free(buffer);
return 1; return 1;
@ -76,7 +76,7 @@ Group 0 begin at s_first_data_block
*/ */
int recover_btrfs(disk_t *disk, const struct btrfs_super_block *sb, partition_t *partition, const int verbose, const int dump_ind) int recover_btrfs(disk_t *disk, const struct btrfs_super_block *sb, partition_t *partition, const int verbose, const int dump_ind)
{ {
if(test_btrfs(sb, partition)!=0) if(test_btrfs(sb)!=0)
return 1; return 1;
if(dump_ind!=0) if(dump_ind!=0)
{ {
@ -112,12 +112,11 @@ int recover_btrfs(disk_t *disk, const struct btrfs_super_block *sb, partition_t
return 0; return 0;
} }
static int test_btrfs(const struct btrfs_super_block *sb, partition_t *partition) static int test_btrfs(const struct btrfs_super_block *sb)
{ {
if(memcmp(&sb->magic, BTRFS_MAGIC, 8)!=0) if(memcmp(&sb->magic, BTRFS_MAGIC, 8)!=0)
return 1; return 1;
if(le32(sb->dev_item.sector_size)==0) if(le32(sb->dev_item.sector_size)==0)
return 1; return 1;
partition->upart_type=UP_BTRFS;
return 0; return 0;
} }