libext2fs, libe2p, misc: git rid of jfs_user.h

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

diff --git a/lib/ext2fs/lookup.c b/lib/ext2fs/lookup.c
index 575806e..c1d802c 100644 (file)
--- a/lib/ext2fs/lookup.c
+++ b/lib/ext2fs/lookup.c
@@ -1,46 +1,45 @@
 /*
  * lookup.c --- ext2fs directory lookup operations
- * 
+ *
  * Copyright (C) 1993, 1994, 1994, 1995 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdlib.h>
-#if HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-#include <linux/ext2_fs.h>
 
+#include "ext2_fs.h"
 #include "ext2fs.h"
 
 struct lookup_struct  {
        const char      *name;
        int             len;
-       ino_t           *inode;
+       ext2_ino_t      *inode;
        int             found;
-};     
+};
 
+#ifdef __TURBOC__
+ #pragma argsused
+#endif
 static int lookup_proc(struct ext2_dir_entry *dirent,
-                      int      offset,
-                      int      blocksize,
-                      char     *buf,
-                      void     *private)
+                      int      offset EXT2FS_ATTR((unused)),
+                      int      blocksize EXT2FS_ATTR((unused)),
+                      char     *buf EXT2FS_ATTR((unused)),
+                      void     *priv_data)
 {
-       struct lookup_struct *ls = (struct lookup_struct *) private;
+       struct lookup_struct *ls = (struct lookup_struct *) priv_data;
 
-       if (ls->len != dirent->name_len)
+       if (ls->len != ext2fs_dirent_name_len(dirent))
                return 0;
-       if (strncmp(ls->name, dirent->name, dirent->name_len))
+       if (strncmp(ls->name, dirent->name, ext2fs_dirent_name_len(dirent)))
                return 0;
        *ls->inode = dirent->inode;
        ls->found++;
@@ -48,8 +47,8 @@ static int lookup_proc(struct ext2_dir_entry *dirent,
 }
 
 
-errcode_t ext2fs_lookup(ext2_filsys fs, ino_t dir, const char *name,
-                       int namelen, char *buf, ino_t *inode)
+errcode_t ext2fs_lookup(ext2_filsys fs, ext2_ino_t dir, const char *name,
+                       int namelen, char *buf, ext2_ino_t *inode)
 {
        errcode_t       retval;
        struct lookup_struct ls;
@@ -65,7 +64,7 @@ errcode_t ext2fs_lookup(ext2_filsys fs, ino_t dir, const char *name,
        if (retval)
                return retval;
 
-       return (ls.found) ? 0 : ENOENT;
+       return (ls.found) ? 0 : EXT2_ET_FILE_NOT_FOUND;
 }