Changeset 26ad20b in mainline

Timestamp:

2011-08-24T22:38:31Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

24738df

Parents:

81e9cb3

Message:

Cleanup mkfat.

Location:

uspace/app/mkfat

Files:

• fat.h (modified) (1 diff)
• mkfat.c (modified) (5 diffs)

uspace/app/mkfat/fat.h

@@ -47 +47 @@
 #define FAT32   32
 
-#define FAT_SIZE(a) ((a==FAT12)? 1.5 : ( (a==FAT16)? 2 : 4  ) ) 
+#define FAT_SIZE(a) (((a) == FAT12) ? 1.5 : (((a) == FAT16) ? 2 : 4)) 
 
 typedef struct fat_bs {

uspace/app/mkfat/mkfat.c

@@ -215 +215 @@
 static void syntax_print(void)
 {
-        printf("syntax: mkfat32 [--size <sectors>] [--type 12|16|32] <device_name>\n");
+        printf("syntax: mkfat [--size <sectors>] [--type 12|16|32] <device_name>\n");
 }
 
@@ -229 +229 @@
 
         /*
-     * Make a conservative guess on the FAT size needed for the file
-     * system. The optimum could be potentially smaller since we
-     * do not subtract size of the FAT itself when computing the
-     * size of the data region.
-     */
+         * Make a conservative guess on the FAT size needed for the file
+         * system. The optimum could be potentially smaller since we
+         * do not subtract size of the FAT itself when computing the
+         * size of the data region.
+         */
 
         if (cfg->fat_type == FAT12)
@@ -242 +242 @@
                 cfg->rootdir_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
                         cfg->sector_size);
-        }
-        else
+        } else
                 cfg->rootdir_sectors = 0;
         non_data_sectors_lb = cfg->reserved_sectors + cfg->rootdir_sectors;
@@ -251 +250 @@
 
         if ((cfg->fat_type == FAT12 && cfg->total_clusters > FAT12_CLST_MAX) ||
-                (cfg->fat_type == FAT16 && (cfg->total_clusters <= FAT12_CLST_MAX ||
-                cfg->total_clusters > FAT16_CLST_MAX)) ||
+            (cfg->fat_type == FAT16 && (cfg->total_clusters <= FAT12_CLST_MAX ||
+            cfg->total_clusters > FAT16_CLST_MAX)) ||
             (cfg->fat_type == FAT32 && cfg->total_clusters <= FAT16_CLST_MAX))
                 return ENOSPC;
@@ -340 +339 @@
                 }
         } else {
-                for (i=0; i<cfg->sectors_per_cluster; i++) {
+                for (i = 0; i < cfg->sectors_per_cluster; i++) {
                         rc = block_write_direct(service_id, addr, 1, buffer);
                         if (rc != EOK)