Another update from Larry:

[oweals/busybox.git] / mkfs_minix.c

diff --git a/mkfs_minix.c b/mkfs_minix.c
index b666338dc1aee487381394f240c38f342d88bdfe..70374eae908248bfd62a3c42f74661cc29e4139c 100644 (file)
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@@ -382,7 +382,7 @@ static void mark_good_blocks(void)
                mark_zone(good_blocks_table[blk]);
 }
 
-inline int next(int zone)
+static int next(int zone)
 {
        if (!zone)
                zone = FIRSTZONE - 1;
@@ -609,7 +609,7 @@ static void setup_tables(void)
  * Perform a test of a block; return the number of
  * blocks readable/writeable.
  */
-long do_check(char *buffer, int try, unsigned int current_block)
+static long do_check(char *buffer, int try, unsigned int current_block)
 {
        long got;
 
@@ -683,10 +683,7 @@ char *filename;
        FILE *listfile;
        unsigned long blockno;
 
-       listfile = fopen(filename, "r");
-       if (listfile == (FILE *) NULL) {
-               error_msg_and_die("can't open file of bad blocks");
-       }
+       listfile = xfopen(filename, "r");
        while (!feof(listfile)) {
                fscanf(listfile, "%ld\n", &blockno);
                mark_zone(blockno);