X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=e2fsprogs%2Fe2fsck.c;h=ceafaea4b7669e29300a1c9e07af3b32752db033;hb=5929edc1fac4340f99ed84e92bf3a2bedd4177c2;hp=eadb0f64dbd51bf45284a9753d0d33a1990382a9;hpb=d8f6601502d8b0c124c3389a9c32b85d36f33869;p=oweals%2Fbusybox.git

diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index eadb0f64d..ceafaea4b 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -39,6 +39,9 @@
 
 #include "e2fsck.h"	/*Put all of our defines here to clean things up*/
 
+#define _(x) x
+#define N_(x) x
+
 /*
  * Procedure declarations
  */
@@ -2891,7 +2894,7 @@ static void mark_inode_bad(e2fsck_t ctx, ino_t ino);
 static void handle_fs_bad_blocks(e2fsck_t ctx);
 static void process_inodes(e2fsck_t ctx, char *block_buf);
 static int process_inode_cmp(const void *a, const void *b);
-static errcode_t scan_callback(ext2_filsys fs, ext2_inode_scan scan,
+static errcode_t scan_callback(ext2_filsys fs,
 				  dgrp_t group, void * priv_data);
 static void adjust_extattr_refcount(e2fsck_t ctx, ext2_refcount_t refcount,
 				    char *block_buf, int adjust_sign);
@@ -3721,7 +3724,6 @@ endit:
  * glock group, call process_inodes.
  */
 static errcode_t scan_callback(ext2_filsys fs,
-			       ext2_inode_scan scan FSCK_ATTR((unused)),
 			       dgrp_t group, void * priv_data)
 {
 	struct scan_callback_struct *scan_struct;
@@ -13202,7 +13204,6 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
 			fprintf(stderr, _("Incompatible options not "
 					  "allowed when byte-swapping.\n"));
 			exit(EXIT_USAGE);
-		}
 	}
 #endif
 	/*