Space and name cleanup

2 files changed, 26 insertions, 23 deletions

diff --git a/src/fat.c b/src/fat.c
index 64b3b3d..467c508 100644
--- a/src/fat.c
+++ b/src/fat.c
@@ -49,7 +49,7 @@ extern const arch_fnct_t arch_mac;
 static int set_FAT_info(disk_t *disk_car, const struct fat_boot_sector *fat_header, partition_t *partition);
 static int fat32_set_part_name(disk_t *disk_car, partition_t *partition, const struct fat_boot_sector*fat_header);
 static int log_fat_info(const struct fat_boot_sector*fh1, const upart_type_t upart_type, const unsigned int sector_size);
-static int test_OS2MB(disk_t *disk_car,const struct fat_boot_sector *fat_header, partition_t *partition,const int verbose, const int dump_ind);
+static int test_OS2MB(const disk_t *disk, const struct fat_boot_sector *fat_header, partition_t *partition,const int verbose, const int dump_ind);
 static int is_fat12(const partition_t *partition);
 static int is_fat16(const partition_t *partition);
 static int is_fat32(const partition_t *partition);
@@ -421,7 +421,7 @@ static unsigned int get_prev_cluster(disk_t *disk_car,const partition_t *partiti
 }
 */
 
-int test_FAT(disk_t *disk_car,const struct fat_boot_sector *fat_header, partition_t *partition,const int verbose, const int dump_ind)
+int test_FAT(disk_t *disk_car, const struct fat_boot_sector *fat_header, partition_t *partition,const int verbose, const int dump_ind)
 {
   uint64_t start_fat1,start_fat2,start_rootdir,start_data,part_size,end_data;
   unsigned long int no_of_cluster,fat_length,fat_length_calc;
@@ -433,7 +433,7 @@ int test_FAT(disk_t *disk_car,const struct fat_boot_sector *fat_header, partitio
   if(verbose>1 || dump_ind!=0)
   {
     log_trace("test_FAT\n");
-    log_partition(disk_car,partition);
+    log_partition(disk_car, partition);
   }
   if(dump_ind!=0)
     dump_log(fat_header, DEFAULT_SECTOR_SIZE);
@@ -854,50 +854,53 @@ static int fat32_set_part_name(disk_t *disk_car, partition_t *partition, const s
   return 0;
 }
 
-int check_OS2MB(disk_t *disk_car,partition_t *partition,const int verbose)
+int check_OS2MB(disk_t *disk, partition_t *partition, const int verbose)
 {
   unsigned char buffer[0x200];
-  if((unsigned)disk_car->pread(disk_car, &buffer, disk_car->sector_size, partition->part_offset) != disk_car->sector_size)
+  if((unsigned)disk->pread(disk, &buffer, disk->sector_size, partition->part_offset) != disk->sector_size)
   {
     screen_buffer_add("check_OS2MB: Read error\n");
     log_error("check_OS2MB: Read error\n");
     return 1;
   }
-  if(test_OS2MB(disk_car,(const struct fat_boot_sector *)buffer,partition,verbose,0)!=0)
+  if(test_OS2MB(disk,(const struct fat_boot_sector *)buffer,partition,verbose,0)!=0)
   {
     if(verbose>0)
     {
       log_info("\n\ntest_OS2MB()\n");
-      log_partition(disk_car,partition);
+      log_partition(disk, partition);
     }
     return 1;
   }
   return 0;
 }
 
-int recover_OS2MB(disk_t *disk_car, const struct fat_boot_sector*fat_header, partition_t *partition, const int verbose, const int dump_ind)
+int recover_OS2MB(const disk_t *disk, const struct fat_boot_sector*fat_header, partition_t *partition, const int verbose, const int dump_ind)
 {
-  if(test_OS2MB(disk_car, fat_header, partition, verbose, dump_ind))
+  if(test_OS2MB(disk, fat_header, partition, verbose, dump_ind))
     return 1;
   /* 1 cylinder */
-  partition->part_size=(uint64_t)disk_car->geom.heads_per_cylinder * disk_car->geom.sectors_per_head * disk_car->sector_size;
+  partition->part_size=(uint64_t)disk->geom.heads_per_cylinder * disk->geom.sectors_per_head * disk->sector_size;
   partition->part_type_i386=P_OS2MB;
   partition->fsname[0]='\0';
   partition->info[0]='\0';
   return 0;
 }
 
-static int test_OS2MB(disk_t *disk_car,const struct fat_boot_sector *fat_header, partition_t *partition,const int verbose, const int dump_ind)
+static int test_OS2MB(const disk_t *disk, const struct fat_boot_sector *fat_header, partition_t *partition,const int verbose, const int dump_ind)
 {
   const char*buffer=(const char*)fat_header;
   if(le16(fat_header->marker)==0xAA55 && memcmp(buffer+FAT_NAME1,"FAT     ",8)==0)
   {
     if(verbose||dump_ind)
     {
-      log_info("OS2MB at %u/%u/%u\n", offset2cylinder(disk_car,partition->part_offset),offset2head(disk_car,partition->part_offset),offset2sector(disk_car,partition->part_offset));
+      log_info("OS2MB at %u/%u/%u\n",
+	  offset2cylinder(disk, partition->part_offset),
+	  offset2head(disk, partition->part_offset),
+	  offset2sector(disk, partition->part_offset));
     }
     if(dump_ind)
-      dump_log(buffer,DEFAULT_SECTOR_SIZE);
+      dump_log(buffer, DEFAULT_SECTOR_SIZE);
     partition->upart_type=UP_OS2MB;
     return 0;
   }
diff --git a/src/fat.h b/src/fat.h
index f4827e6..bed329e 100644
--- a/src/fat.h
+++ b/src/fat.h
@@ -103,11 +103,11 @@ struct msdos_dir_slot {
 };
 
 
-int comp_FAT(disk_t *disk_car,const partition_t *partition, const unsigned long int fat_size, const unsigned long int sect_res);
+int comp_FAT(disk_t *disk,const partition_t *partition, const unsigned long int fat_size, const unsigned long int sect_res);
 int log_fat2_info(const struct fat_boot_sector*fh1, const struct fat_boot_sector*fh2, const upart_type_t upart_type, const unsigned int sector_size);
 
-unsigned int get_next_cluster(disk_t *disk_car,const partition_t *partition, const upart_type_t upart_type,const int offset, const unsigned int cluster);
-int set_next_cluster(disk_t *disk_car,const partition_t *partition, const upart_type_t upart_type,const int offset, const unsigned int cluster, const unsigned int next_cluster);
+unsigned int get_next_cluster(disk_t *disk,const partition_t *partition, const upart_type_t upart_type,const int offset, const unsigned int cluster);
+int set_next_cluster(disk_t *disk,const partition_t *partition, const upart_type_t upart_type,const int offset, const unsigned int cluster, const unsigned int next_cluster);
 
 int is_fat(const partition_t *partition);
 int is_part_fat(const partition_t *partition);
@@ -117,8 +117,8 @@ int is_part_fat32(const partition_t *partition);
 unsigned int get_dir_entries(const struct fat_boot_sector *fat_header);
 unsigned int fat_sector_size(const struct fat_boot_sector *fat_header);
 unsigned int sectors(const struct fat_boot_sector *fat_header);
-unsigned int fat32_get_prev_cluster(disk_t *disk_car,const partition_t *partition, const unsigned int fat_offset, const unsigned int cluster, const unsigned int no_of_cluster);
-int fat32_free_info(disk_t *disk_car,const partition_t *partition, const unsigned int fat_offset, const unsigned int no_of_cluster, unsigned int *next_free, unsigned int*free_count);
+unsigned int fat32_get_prev_cluster(disk_t *disk,const partition_t *partition, const unsigned int fat_offset, const unsigned int cluster, const unsigned int no_of_cluster);
+int fat32_free_info(disk_t *disk,const partition_t *partition, const unsigned int fat_offset, const unsigned int no_of_cluster, unsigned int *next_free, unsigned int*free_count);
 unsigned long int fat32_get_free_count(const unsigned char *boot_fat32, const unsigned int sector_size);
 unsigned long int fat32_get_next_free(const unsigned char *boot_fat32, const unsigned int sector_size);
 
@@ -145,11 +145,11 @@ unsigned long int fat32_get_next_free(const unsigned char *boot_fat32, const uns
 #define FAT32_EOC	0x0FFFFFF8
 #define FAT1x_BOOT_SECTOR_SIZE 0x200
 
-int recover_FAT(disk_t *disk_car,const struct fat_boot_sector*fat_header, partition_t *partition, const int verbose, const int dump_ind, const int backup);
-int check_FAT(disk_t *disk_car,partition_t *partition, const int verbose);
-int test_FAT(disk_t *disk_car,const struct fat_boot_sector *fat_header, partition_t *partition,const int verbose, const int dump_ind);
-int recover_OS2MB(disk_t *disk_car, const struct fat_boot_sector*fat_header, partition_t *partition, const int verbose, const int dump_ind);
-int check_OS2MB(disk_t *disk_car,partition_t *partition, const int verbose);
+int recover_FAT(disk_t *disk, const struct fat_boot_sector*fat_header, partition_t *partition, const int verbose, const int dump_ind, const int backup);
+int check_FAT(disk_t *disk, partition_t *partition, const int verbose);
+int test_FAT(disk_t *disk, const struct fat_boot_sector *fat_header, partition_t *partition, const int verbose, const int dump_ind);
+int recover_OS2MB(const disk_t *disk, const struct fat_boot_sector*fat_header, partition_t *partition, const int verbose, const int dump_ind);
+int check_OS2MB(disk_t *disk, partition_t *partition, const int verbose);
 int check_VFAT_volume_name(const char *name, const unsigned int max_size);
 
 #ifdef __cplusplus