2002-12-09 Moritz Schulte <moritz@duesseldorf.ccc.de>

	* lib.h: Fix pointer arg.
	* lib.c (dir_entries_get): Likewise.
	* lib.c (dir_entries_get): Fix typo.
	(dir_entries_get): Change type of data_size to size_t.
	* node.c (node_entries_get): Change type of dirent_data_size to
	size_t.

4 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 88e70ba..9d00438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-09  Moritz Schulte  <moritz@duesseldorf.ccc.de>
+
+	* lib.h: Fix pointer arg.
+	* lib.c (dir_entries_get): Likewise.
+	* lib.c (dir_entries_get): Fix typo.
+	(dir_entries_get): Change type of data_size to size_t.
+	* node.c (node_entries_get): Change type of dirent_data_size to
+	size_t.
+
 2002-12-08  Moritz Schulte  <moritz@duesseldorf.ccc.de>
 
 	* BUGS: Remove the memory-leak bug.
diff --git a/lib.c b/lib.c
index dfb90fd..86d8ce5 100644
--- a/lib.c
+++ b/lib.c
@@ -24,6 +24,7 @@
 #include <dirent.h>
 #include <errno.h>
 #include <sys/mman.h>
+#include <stddef.h>
 
 #include "lib.h"
 
@@ -37,7 +38,7 @@ struct mutex debug_msg_lock = MUTEX_INITIALIZER;
    in *DIRENT_LIST.  */
 error_t
 dir_entries_get (file_t dir, char **dirent_data, 
-		 int *dirent_data_size, struct dirent **dirent_list)
+		 size_t *dirent_data_size, struct dirent ***dirent_list)
 {
   error_t err;
   size_t data_size;
@@ -67,7 +68,7 @@ dir_entries_get (file_t dir, char **dirent_data,
 	}
       else
 	{
-	  munmap (data, date_size);
+	  munmap (data, data_size);
 	  err = ENOMEM;
 	}
     }
diff --git a/lib.h b/lib.h
index c3dfbbd..7699bd8 100644
--- a/lib.h
+++ b/lib.h
@@ -46,7 +46,8 @@
    *DIRENT_DATA_SIZE and a list of pointers to the dirent structures
    in *DIRENT_LIST.  */
 error_t dir_entries_get (file_t dir, char **dirent_data,
-			 int *dirent_data_size, struct dirent **dirent_list);
+			 size_t *dirent_data_size,
+			 struct dirent ***dirent_list);
 
 /* Lookup the file named NAME beneath DIR (or the cwd, if DIR is not a
    valid port.  Try to open with FLAGS0 first, and if that fails with
diff --git a/node.c b/node.c
index a4825b9..177243e 100644
--- a/node.c
+++ b/node.c
@@ -249,7 +249,7 @@ node_entries_get (node_t *node, node_dirent_t **dirents)
 {
   struct dirent **dirent_list, **dirent;
   node_dirent_t *node_dirent_list = NULL;
-  int dirent_data_size;
+  size_t dirent_data_size;
   char *dirent_data;
   error_t err = 0;