4 files changed, 8 insertions, 5 deletions
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index 49809fa9..4bbb5743 100644
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -72,6 +72,7 @@ static void verify_disk(char *name)
 	    fprintf(stderr,
 		    _("Problem reading cylinder %d, expected %d, read %d\n"),
 		    cyl, cyl_size, read_bytes);
+	    free(data);
 	    exit(1);
 	}
 	for (count = 0; count < cyl_size; count++)
@@ -81,6 +82,7 @@ static void verify_disk(char *name)
 		break;
 	    }
     }
+    free(data);
     printf(_("done\n"));
     if (close(fd) < 0) PERROR("close");
 }
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index af54c987..74d1793c 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -100,12 +100,12 @@
 #include <termios.h>
 #include <mntent.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <signal.h>
 
 #include "minix.h"
 #include "nls.h"
 #include "pathnames.h"
+#include "bitops.h"
 
 #ifndef __linux__
 #define volatile
@@ -170,8 +170,8 @@ static unsigned char * zone_count = NULL;
 static void recursive_check(unsigned int ino);
 static void recursive_check2(unsigned int ino);
 
-#define inode_in_use(x) (isset(inode_map,(x)))
-#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1))
+#define inode_in_use(x) (isset(inode_map,(x)) != 0)
+#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1) != 0)
 
 #define mark_inode(x) (setbit(inode_map,(x)),changed=1)
 #define unmark_inode(x) (clrbit(inode_map,(x)),changed=1)
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index e669ec6b..5f50d667 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -77,6 +77,7 @@
 #include "minix.h"
 #include "nls.h"
 #include "pathnames.h"
+#include "bitops.h"
 
 #define MINIX_ROOT_INO 1
 #define MINIX_BAD_INO 2
@@ -132,8 +133,7 @@ static unsigned short good_blocks_table[MAX_GOOD_BLOCKS];
 static int used_good_blocks = 0;
 static unsigned long req_nr_inodes = 0;
 
-#define inode_in_use(x) (isset(inode_map,(x)))
-#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1))
+#define zone_in_use(x) (isset(zone_map,(x)-FIRSTZONE+1) != 0)
 
 #define mark_inode(x) (setbit(inode_map,(x)))
 #define unmark_inode(x) (clrbit(inode_map,(x)))
diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8
index 442850af..cdb2a442 100644
--- a/disk-utils/mkswap.8
+++ b/disk-utils/mkswap.8
@@ -16,6 +16,7 @@ mkswap \- set up a Linux swap area
 .IR label ]
 .RB [ \-U
 .IR uuid ]
+.I device
 .RI [ size ]
 .SH DESCRIPTION
 .B mkswap