summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/analyse.c6
-rw-r--r--src/analyse.h2
-rw-r--r--src/exfat.c20
-rw-r--r--src/exfat.h6
-rw-r--r--src/godmode.c2
-rw-r--r--src/partgpt.c2
-rw-r--r--src/parti386.c4
-rw-r--r--src/partnone.c4
-rw-r--r--src/texfat.c4
9 files changed, 25 insertions, 25 deletions
diff --git a/src/analyse.c b/src/analyse.c
index a8448d1..3e9d356 100644
--- a/src/analyse.c
+++ b/src/analyse.c
@@ -100,7 +100,7 @@ int search_HFS_backup(unsigned char *buffer, disk_t *disk, partition_t *partitio
return 0;
}
-int search_EXFAT_backup(unsigned char *buffer, disk_t *disk, partition_t *partition)
+int search_exFAT_backup(unsigned char *buffer, disk_t *disk, partition_t *partition)
{
if(disk->pread(disk, buffer, DEFAULT_SECTOR_SIZE, partition->part_offset) != DEFAULT_SECTOR_SIZE)
return -1;
@@ -108,7 +108,7 @@ int search_EXFAT_backup(unsigned char *buffer, disk_t *disk, partition_t *partit
const struct exfat_super_block *exfat_header=(const struct exfat_super_block *)buffer;
/* EXFAT recovery using backup sector */
if(le16(exfat_header->signature)==0xAA55 &&
- recover_EXFAT(disk, exfat_header, partition)==0)
+ recover_exFAT(disk, exfat_header, partition)==0)
{
/* part_offset has already been updated if found using backup sector */
return 1;
@@ -171,7 +171,7 @@ int search_type_0(const unsigned char *buffer, disk_t *disk, partition_t *partit
recover_FAT(disk, fat_header, partition, verbose, dump_ind, 0)==0)
return 1;
if(le16(exfat_header->signature)==0xAA55 &&
- recover_EXFAT(disk, exfat_header, partition)==0)
+ recover_exFAT(disk, exfat_header, partition)==0)
return 1;
if(le16(fat_header->marker)==0xAA55 &&
recover_HPFS(disk, fat_header, partition, verbose)==0)
diff --git a/src/analyse.h b/src/analyse.h
index a6c4f88..82c1b61 100644
--- a/src/analyse.h
+++ b/src/analyse.h
@@ -31,7 +31,7 @@ int search_type_16(unsigned char *buffer, disk_t *disk_car,partition_t *partitio
int search_type_64(unsigned char *buffer, disk_t *disk_car,partition_t *partition,const int verbose, const int dump_ind);
int search_type_128(unsigned char *buffer, disk_t *disk_car,partition_t *partition,const int verbose, const int dump_ind);
int search_type_2048(unsigned char *buffer, disk_t *disk_car,partition_t *partition,const int verbose, const int dump_ind);
-int search_EXFAT_backup(unsigned char *buffer, disk_t *disk, partition_t *partition);
+int search_exFAT_backup(unsigned char *buffer, disk_t *disk, partition_t *partition);
int search_FAT_backup(unsigned char *buffer, disk_t *disk_car,partition_t *partition, const int verbose, const int dump_ind);
int search_HFS_backup(unsigned char *buffer, disk_t *disk_car,partition_t *partition, const int verbose, const int dump_ind);
int search_NTFS_backup(unsigned char *buffer, disk_t *disk_car,partition_t *partition, const int verbose, const int dump_ind);
diff --git a/src/exfat.c b/src/exfat.c
index 62cf983..8d6d28d 100644
--- a/src/exfat.c
+++ b/src/exfat.c
@@ -50,7 +50,7 @@ int exfat_read_cluster(disk_t *disk, const partition_t *partition, const struct
partition->part_offset + exfat_cluster_to_offset(exfat_header, cluster));
}
-static void set_EXFAT_info(partition_t *partition, const struct exfat_super_block*exfat_header)
+static void set_exFAT_info(partition_t *partition, const struct exfat_super_block*exfat_header)
{
partition->upart_type=UP_EXFAT;
partition->blocksize=1<<(exfat_header->block_per_clus_bits + exfat_header->blocksize_bits);
@@ -61,7 +61,7 @@ static void set_EXFAT_info(partition_t *partition, const struct exfat_super_bloc
snprintf(partition->info, sizeof(partition->info), "exFAT found using backup sector, blocksize=%u", partition->blocksize);
}
-int check_EXFAT(disk_t *disk, partition_t *partition)
+int check_exFAT(disk_t *disk, partition_t *partition)
{
unsigned char *buffer=(unsigned char*)MALLOC(EXFAT_BS_SIZE);
if(disk->pread(disk, buffer, EXFAT_BS_SIZE, partition->part_offset) != EXFAT_BS_SIZE)
@@ -69,17 +69,17 @@ int check_EXFAT(disk_t *disk, partition_t *partition)
free(buffer);
return 1;
}
- if(test_EXFAT((struct exfat_super_block*)buffer)!=0)
+ if(test_exFAT((struct exfat_super_block*)buffer)!=0)
{
free(buffer);
return 1;
}
- set_EXFAT_info(partition, (struct exfat_super_block*)buffer);
+ set_exFAT_info(partition, (struct exfat_super_block*)buffer);
free(buffer);
return 0;
}
-int test_EXFAT(const struct exfat_super_block *exfat_header)
+int test_exFAT(const struct exfat_super_block *exfat_header)
{
if(le16(exfat_header->signature)!=0xAA55)
return 1;
@@ -88,17 +88,17 @@ int test_EXFAT(const struct exfat_super_block *exfat_header)
return 0;
}
-int recover_EXFAT(const disk_t *disk, const struct exfat_super_block *exfat_header, partition_t *partition)
+int recover_exFAT(const disk_t *disk, const struct exfat_super_block *exfat_header, partition_t *partition)
{
- if(test_EXFAT(exfat_header)!=0)
+ if(test_exFAT(exfat_header)!=0)
return 1;
partition->sborg_offset=0;
partition->sb_size=12 << exfat_header->blocksize_bits;
partition->part_type_i386=P_EXFAT;
partition->part_type_gpt=GPT_ENT_TYPE_MS_BASIC_DATA;
partition->part_size=(uint64_t)le64(exfat_header->nr_sectors) * disk->sector_size;
-#ifdef DEBUG_EXFAT
- log_info("recover_EXFAT:\n");
+#ifdef DEBUG_exFAT
+ log_info("recover_exFAT:\n");
log_info("start_sector=%llu\n", (long long unsigned)le64(exfat_header->start_sector));
log_info("blocksize=%u\n", (12<<exfat_header->blocksize_bits));
log_info("part_offset=%llu\n", partition->part_offset);
@@ -110,6 +110,6 @@ int recover_EXFAT(const disk_t *disk, const struct exfat_super_block *exfat_head
partition->sb_offset=12 << exfat_header->blocksize_bits;
partition->part_offset-=partition->sb_offset;
}
- set_EXFAT_info(partition, exfat_header);
+ set_exFAT_info(partition, exfat_header);
return 0;
}
diff --git a/src/exfat.h b/src/exfat.h
index bcbb504..fc1ff4d 100644
--- a/src/exfat.h
+++ b/src/exfat.h
@@ -94,9 +94,9 @@ struct exfat_alloc_bitmap_entry
uint64_t exfat_cluster_to_offset(const struct exfat_super_block *exfat_header, const unsigned int cluster);
int exfat_read_cluster(disk_t *disk, const partition_t *partition, const struct exfat_super_block*exfat_header, void *buffer, const unsigned int cluster);
-int check_EXFAT(disk_t *disk, partition_t *partition);
-int recover_EXFAT(const disk_t *disk, const struct exfat_super_block *exfat_header, partition_t *partition);
-int test_EXFAT(const struct exfat_super_block *exfat_header);
+int check_exFAT(disk_t *disk, partition_t *partition);
+int recover_exFAT(const disk_t *disk, const struct exfat_super_block *exfat_header, partition_t *partition);
+int test_exFAT(const struct exfat_super_block *exfat_header);
#ifdef __cplusplus
} /* closing brace for extern "C" */
diff --git a/src/godmode.c b/src/godmode.c
index 63771a7..34c0a09 100644
--- a/src/godmode.c
+++ b/src/godmode.c
@@ -724,7 +724,7 @@ static list_part_t *search_part(disk_t *disk_car, const list_part_t *list_part_o
search_location%(2048*512)==(13-1)*disk_car->sector_size)) ||
(disk_car->arch==&arch_gpt&& (search_location%(2048*512)==(13-1)*512)) ||
(disk_car->arch!=&arch_i386 && (search_location%location_boundary==(13-1)*disk_car->sector_size)))
- res=search_EXFAT_backup(buffer_disk, disk_car, partition);
+ res=search_exFAT_backup(buffer_disk, disk_car, partition);
test_nbr++;
}
if(res<=0 && test_nbr==3)
diff --git a/src/partgpt.c b/src/partgpt.c
index e21d620..3ca598c 100644
--- a/src/partgpt.c
+++ b/src/partgpt.c
@@ -457,7 +457,7 @@ static int check_part_gpt(disk_t *disk, const int verbose,partition_t *partition
{
ret=check_FAT(disk,partition,verbose);
if(ret!=0)
- ret=check_EXFAT(disk, partition);
+ ret=check_exFAT(disk, partition);
if(ret!=0)
ret=check_NTFS(disk,partition,verbose,0);
if(ret!=0)
diff --git a/src/parti386.c b/src/parti386.c
index 5a8c15a..dd4f021 100644
--- a/src/parti386.c
+++ b/src/parti386.c
@@ -1597,10 +1597,10 @@ static int check_part_i386(disk_t *disk_car,const int verbose,partition_t *parti
ret=check_NTFS(disk_car,partition,verbose,0);
if(ret!=0)
{
- ret=check_EXFAT(disk_car, partition);
+ ret=check_exFAT(disk_car, partition);
}
if(ret!=0)
- { screen_buffer_add("Invalid NTFS or EXFAT boot\n"); }
+ { screen_buffer_add("Invalid NTFS or exFAT boot\n"); }
break;
case P_OPENBSD:
ret=check_BSD(disk_car,partition,verbose,OPENBSD_MAXPARTITIONS);
diff --git a/src/partnone.c b/src/partnone.c
index 80a29cc..f493f3e 100644
--- a/src/partnone.c
+++ b/src/partnone.c
@@ -251,7 +251,7 @@ static list_part_t *read_part_none(disk_t *disk, const int verbose, const int sa
if(res<=0)
{ /* Search exFAT backup */
partition->part_offset = 12 * disk->sector_size;
- res=search_EXFAT_backup(buffer_disk, disk, partition);
+ res=search_exFAT_backup(buffer_disk, disk, partition);
}
if(res<=0)
{ /* Search NTFS backup */
@@ -357,7 +357,7 @@ static int check_part_none(disk_t *disk_car,const int verbose,partition_t *parti
case UP_EXTENDED:
break;
case UP_EXFAT:
- ret=check_EXFAT(disk_car, partition);
+ ret=check_exFAT(disk_car, partition);
break;
case UP_FAT12:
case UP_FAT16:
diff --git a/src/texfat.c b/src/texfat.c
index 5b2c3da..68b2fff 100644
--- a/src/texfat.c
+++ b/src/texfat.c
@@ -124,7 +124,7 @@ int exFAT_boot_sector(disk_t *disk, partition_t *partition, const int verbose, c
screen_buffer_add("Bad: can't read exFAT boot record.\n");
memset(buffer_bs,0,size_bs);
}
- else if(test_EXFAT((const struct exfat_super_block*)buffer_bs)==0)
+ else if(test_exFAT((const struct exfat_super_block*)buffer_bs)==0)
{
screen_buffer_add("exFAT OK\n");
opt_O=1;
@@ -138,7 +138,7 @@ int exFAT_boot_sector(disk_t *disk, partition_t *partition, const int verbose, c
screen_buffer_add("Bad: can't read exFAT backup boot record.\n");
memset(buffer_backup_bs,0,size_bs);
}
- else if(test_EXFAT((const struct exfat_super_block*)buffer_backup_bs)==0)
+ else if(test_exFAT((const struct exfat_super_block*)buffer_backup_bs)==0)
{
screen_buffer_add("exFAT OK\n");
opt_B=1;