More code from kernel developers, and therefore licensed under GPLv2 only.

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

diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index a9c4467d8463a7b11560400ec602925a25ebdcff..c0dda2f1fef1492f4277a56e5f7e89e498de9b10 100644 (file)
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -2,8 +2,9 @@
 /*
  * fsck.c - a file system consistency checker for Linux.
  *
- * (C) 1991, 1992 Linus Torvalds. This file may be redistributed
- * as per the GNU copyleft.
+ * (C) 1991, 1992 Linus Torvalds.
+ *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
  */
 
 /*
@@ -86,20 +87,8 @@
  * enforced (but it's not much fun on a character device :-).
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <mntent.h>
-#include <sys/param.h>
 #include "busybox.h"
-
-#define BLOCK_SIZE_BITS 10
-#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
+#include <mntent.h>
 
 /*
  * This is the original minix inode layout on disk.
@@ -250,7 +239,7 @@ static void recursive_check(unsigned int ino);
 static void recursive_check2(unsigned int ino);
 #endif
 
-static inline int bit(char *a, unsigned int i)
+static int bit(char *a, unsigned int i)
 {
          return (a[i >> 3] & (1<<(i & 7))) != 0;
 }
@@ -285,7 +274,7 @@ static char *name_component[MAX_DEPTH+1];
 
 /* Wed Feb  9 15:17:06 MST 2000 */
 /* dynamically allocate name_list (instead of making it static) */
-static inline void alloc_current_name(void)
+static void alloc_current_name(void)
 {
        current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1));
        current_name[0] = '/';
@@ -296,7 +285,7 @@ static inline void alloc_current_name(void)
 #ifdef CONFIG_FEATURE_CLEAN_UP
 /* execute this atexit() to deallocate name_list[] */
 /* piptigger was here */
-static inline void free_current_name(void)
+static void free_current_name(void)
 {
        free(current_name);
 }