hush: get rid of charmap[]

[oweals/busybox.git] / util-linux / mkfs_minix.c

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index ceeb72a2be32a986f01cf5d04c66b0931a0dbafe..2666132f978e44fcdc9639f10da97a0e9fde6c8f 100644 (file)
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -2,8 +2,9 @@
 /*
  * mkfs.c - make a linux (minix) file-system.
  *
- * (C) 1991 Linus Torvalds. This file may be redistributed as per
- * the Linux copyright.
+ * (C) 1991 Linus Torvalds.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 /*
@@ -109,7 +110,7 @@ struct globals {
        unsigned currently_testing;
 
        char root_block[BLOCK_SIZE];
-       char super_block_buffer[BLOCK_SIZE];
+       char superblock_buffer[BLOCK_SIZE];
        char boot_block_buffer[512];
        unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
        /* check_blocks(): buffer[] was the biggest static in entire bbox */
@@ -133,7 +134,7 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
 #define INODE_BUF1              (((struct minix1_inode*)G.inode_buffer) - 1)
 #define INODE_BUF2              (((struct minix2_inode*)G.inode_buffer) - 1)
 
-#define SB                      (*(struct minix_super_block*)G.super_block_buffer)
+#define SB                      (*(struct minix_superblock*)G.superblock_buffer)
 
 #define SB_INODES               (SB.s_ninodes)
 #define SB_IMAPS                (SB.s_imap_blocks)
@@ -160,7 +161,7 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
 
 static int minix_bit(const char* a, unsigned i)
 {
-         return a[i >> 3] & (1<<(i & 7));
+       return a[i >> 3] & (1<<(i & 7));
 }
 
 static void minix_setbit(char *a, unsigned i)
@@ -235,7 +236,7 @@ static int get_size(const char *file)
 
 static void write_tables(void)
 {
-       /* Mark the super block valid. */
+       /* Mark the superblock valid. */
        SB.s_state |= MINIX_VALID_FS;
        SB.s_state &= ~MINIX_ERROR_FS;
 
@@ -249,7 +250,7 @@ static void write_tables(void)
        xlseek(dev_fd, BLOCK_SIZE, SEEK_SET);
 
        msg_eol = "cannot write superblock";
-       xwrite(dev_fd, G.super_block_buffer, BLOCK_SIZE);
+       xwrite(dev_fd, G.superblock_buffer, BLOCK_SIZE);
 
        msg_eol = "cannot write inode map";
        xwrite(dev_fd, G.inode_map, SB_IMAPS * BLOCK_SIZE);
@@ -540,7 +541,7 @@ static void get_list_blocks(char *filename)
        FILE *listfile;
        unsigned long blockno;
 
-       listfile = xfopen(filename, "r");
+       listfile = xfopen_for_read(filename);
        while (!feof(listfile)) {
                fscanf(listfile, "%ld\n", &blockno);
                mark_zone(blockno);
@@ -556,7 +557,7 @@ static void setup_tables(void)
        unsigned sb_zmaps;
        unsigned i;
 
-       /* memset(G.super_block_buffer, 0, BLOCK_SIZE); */
+       /* memset(G.superblock_buffer, 0, BLOCK_SIZE); */
        /* memset(G.boot_block_buffer, 0, 512); */
        SB_MAGIC = G.magic;
        SB_ZONE_SIZE = 0;