X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.c;h=2519228890bc2c25f1b82da6887585afe42840ae;hp=7b4f91f59470089182b21b62d57a0bad5e324e54;hb=7ab176a3b0771cfcdd8ee103cd5452e971d12e26;hpb=d237ec8d2fc5a697f4fa36832cfd6a037a8db7e6

diff --git a/osl.c b/osl.c
index 7b4f91f5..25192288 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.
  */
@@ -179,7 +179,7 @@ int for_each_file_in_dir(const char *dirname,
 	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 +305,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)
@@ -1575,7 +1575,7 @@ int osl_del_row(struct osl_table *t, struct osl_row *row)
 			mark_mapped_object_invalid(t, r->num, i);
 			continue;
 		}
-		if (st == OSL_NO_STORAGE)
+		if (st == OSL_NO_STORAGE && !(cd->storage_flags & OSL_DONT_FREE))
 			free(r->volatile_objects[col->volatile_num].data);
 	}
 	if (t->num_mapped_columns) {
@@ -2013,8 +2013,17 @@ int osl_get_nth_row(const struct osl_table *t, unsigned col_num,
 {
 	struct osl_column *col;
 	struct rb_node *node;
-	int ret = check_rbtree_col(t, col_num, &col);
+	unsigned num_rows;
+	int ret;
 
+	if (n == 0)
+		return -E_RB_KEY_NOT_FOUND;
+	ret = osl_get_num_rows(t, &num_rows);
+	if (ret < 0)
+		return ret;
+	if (n > num_rows)
+		return -E_RB_KEY_NOT_FOUND;
+	ret = check_rbtree_col(t, col_num, &col);
 	if (ret < 0)
 		return ret;
 	node = rb_nth(col->rbtree.rb_node, n);