Fix gcc -Wall nits.

[tools/e2fsprogs.git] / lib / ext2fs / dblist_dir.c

diff --git a/lib/ext2fs/dblist_dir.c b/lib/ext2fs/dblist_dir.c
index 7ad159e..f0e4a26 100644 (file)
--- a/lib/ext2fs/dblist_dir.c
+++ b/lib/ext2fs/dblist_dir.c
@@ -17,29 +17,23 @@
 #include <string.h>
 #include <time.h>
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
-#endif
-
 #include "ext2fsP.h"
 
 static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry *db_info,
                       void *priv_data);
 
-extern errcode_t
-       ext2fs_dblist_dir_iterate(ext2_dblist dblist,
-                                 int   flags,
-                                 char  *block_buf,
-                                 int (*func)(ino_t     dir,
-                                             int       entry,
-                                             struct ext2_dir_entry *dirent,
-                                             int       offset,
-                                             int       blocksize,
-                                             char      *buf,
-                                             void      *priv_data),
-                                 void *priv_data)
+errcode_t ext2fs_dblist_dir_iterate(ext2_dblist dblist,
+                                   int flags,
+                                   char        *block_buf,
+                                   int (*func)(ext2_ino_t dir,
+                                               int     entry,
+                                               struct ext2_dir_entry *dirent,
+                                               int     offset,
+                                               int     blocksize,
+                                               char    *buf,
+                                               void    *priv_data),
+                                   void *priv_data)
 {
        errcode_t               retval;
        struct dir_context      ctx;
@@ -56,8 +50,7 @@ extern errcode_t
                if (retval)
                        return retval;
        }
-       ctx.func = 0;
-       ctx.func2 = func;
+       ctx.func = func;
        ctx.priv_data = priv_data;
        ctx.errcode = 0;
 
@@ -79,5 +72,5 @@ static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry *db_info,
        ctx->dir = db_info->ino;
        
        return ext2fs_process_dir_block(fs, &db_info->blk,
-                                       db_info->blockcnt, priv_data);
+                                       db_info->blockcnt, 0, 0, priv_data);
 }