Remove unused function parameter, from Garrett.

diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index c169ed40dcf839c190449de11299bf90296d9b2a..6f3fd7edaa4901ba166de0b6609670112d50d7d5 100644 (file)
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -2891,7 +2891,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 +3721,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;

diff --git a/e2fsprogs/ext2fs/ext2fs.h b/e2fsprogs/ext2fs/ext2fs.h
index 76d2ddd45f5f2211d2f6a86f261ca95af3aa3b07..d5a0791eb4cf10e83f9f9964a74c35e13c26489d 100644 (file)
--- a/e2fsprogs/ext2fs/ext2fs.h
+++ b/e2fsprogs/ext2fs/ext2fs.h
@@ -752,7 +752,6 @@ extern errcode_t ext2fs_inode_scan_goto_blockgroup(ext2_inode_scan scan,
 extern void ext2fs_set_inode_callback
        (ext2_inode_scan scan,
         errcode_t (*done_group)(ext2_filsys fs,
-                                ext2_inode_scan scan,
                                 dgrp_t group,
                                 void * priv_data),
         void *done_group_data);

diff --git a/e2fsprogs/ext2fs/inode.c b/e2fsprogs/ext2fs/inode.c
index db5201829e64d585debb1a815fe74e31490d5941..8608dc88be8af4a35306bdab303d5723217f09aa 100644 (file)
--- a/e2fsprogs/ext2fs/inode.c
+++ b/e2fsprogs/ext2fs/inode.c
@@ -44,7 +44,6 @@ struct ext2_struct_inode_scan {
        int                     bytes_left;
        char                    *temp_buffer;
        errcode_t               (*done_group)(ext2_filsys fs,
-                                             ext2_inode_scan scan,
                                              dgrp_t group,
                                              void * priv_data);
        void *                  done_group_data;
@@ -183,7 +182,6 @@ void ext2fs_close_inode_scan(ext2_inode_scan scan)
 
 void ext2fs_set_inode_callback(ext2_inode_scan scan,
                               errcode_t (*done_group)(ext2_filsys fs,
-                                                      ext2_inode_scan scan,
                                                       dgrp_t group,
                                                       void * priv_data),
                               void *done_group_data)
@@ -393,7 +391,7 @@ errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
        force_new_group:
                if (scan->done_group) {
                        retval = (scan->done_group)
-                               (scan->fs, scan, scan->current_group,
+                               (scan->fs, scan->current_group,
                                 scan->done_group_data);
                        if (retval)
                                return retval;