From 54c6afb460642e1069a9d3e9f9ebeb7cad2cd8ba Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Mon, 3 Jan 2000 20:27:13 +0000
Subject: 2000-01-03  Roland McGrath  <roland@baalperazim.frob.com>

	* file_io.h: Include "../ext2fs/ext2_fs.h" instead of "ext2_fs.h".
	* ext2_file_io.c (search_directory): Use `struct ext2_dir_entry_2' in
	place of `struct ext2_dir_entry', so as to grok newer dir formats.
	* ext2_fs.h: File removed.
	* Makefile (LCLHDRS): Remove it from the list.
	* ffs_compat.c (EXT2_INODES_PER_BLOCK): New macro, no longer in
	ext2_fs.h.
---
 serverboot/ext2_file_io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'serverboot/ext2_file_io.c')

diff --git a/serverboot/ext2_file_io.c b/serverboot/ext2_file_io.c
index d96ad576..28ee2cb3 100644
--- a/serverboot/ext2_file_io.c
+++ b/serverboot/ext2_file_io.c
@@ -374,7 +374,7 @@ search_directory(name, fp, inumber_p)
 	vm_offset_t	buf;
 	vm_size_t	buf_size;
 	vm_offset_t	offset;
-	register struct ext2_dir_entry *dp;
+	struct ext2_dir_entry_2 *dp;
 	int		length;
 	kern_return_t	rc;
 	char		tmp_name[256];
@@ -387,7 +387,7 @@ search_directory(name, fp, inumber_p)
 	    if (rc != KERN_SUCCESS)
 		return (rc);
 
-	    dp = (struct ext2_dir_entry *)buf;
+	    dp = (struct ext2_dir_entry_2 *)buf;
 	    if (dp->inode != 0) {
 		strncpy (tmp_name, dp->name, dp->name_len);
 		tmp_name[dp->name_len] = '\0';
-- 
cgit v1.2.3