X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.c;h=bc6956e9958a01aa3457806e5ac7efac7bf6cad8;hp=9843a02034fc8927bdcce36be4bc6f7959d6f88d;hb=335730538150250f32c0df0b184fb494e2bb0df3;hpb=c47aa3e188e0e51b4dfdf957a140177bfc03a8da

diff --git a/osl.c b/osl.c
index 9843a020..bc6956e9 100644
--- a/osl.c
+++ b/osl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -168,18 +168,17 @@ out:
  * are passed to \a func. Directories for which the calling process has no
  * permissions to change to are silently ignored.
  *
- * \return On success, 1 is returned. Otherwise, this function returns a
- * negative value which indicates the kind of the error.
+ * \return Standard.
  */
 int for_each_file_in_dir(const char *dirname,
-		int (*func)(const char *, const void *), const void *private_data)
+		int (*func)(const char *, void *), void *private_data)
 {
 	DIR *dir;
 	struct dirent *entry;
 	int cwd_fd, ret2, ret = para_opendir(dirname, &dir, &cwd_fd);
 
 	if (ret < 0)
-		return ret == -E_CHDIR_PERM? 1 : ret;
+		return ret == -ERRNO_TO_PARA_ERROR(EACCES)? 1 : ret;
 	/* scan cwd recursively */
 	while ((entry = readdir(dir))) {
 		mode_t m;
@@ -305,7 +304,7 @@ static int disk_storage_name_of_row(const struct osl_table *t,
 
 static void column_name_hash(const char *col_name, HASH_TYPE *hash)
 {
-	return hash_function(col_name, strlen(col_name), hash);
+	hash_function(col_name, strlen(col_name), hash);
 }
 
 static int init_column_descriptions(struct osl_table *t)