X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.c;h=ff588713b320aad0ef7e80a5258ac80f0c148622;hp=6294fbbe3f8900f3bf9830a30ccb8bfed150383a;hb=35993f0cd49206666262cfdd2be89af41ec28a1d;hpb=97f53e18953fc2013c0b14f0261ac385e45b0284

diff --git a/osl.c b/osl.c
index 6294fbbe..ff588713 100644
--- a/osl.c
+++ b/osl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -12,7 +12,6 @@
 #include "para.h"
 #include "error.h"
 #include "fd.h"
-#include "list.h"
 #include "osl_core.h"
 /**
  * A wrapper for lseek(2).
@@ -32,8 +31,9 @@
  */
 int para_lseek(int fd, off_t *offset, int whence)
 {
-	*offset = lseek(fd, *offset, whence);
 	int ret = -E_LSEEK;
+
+	*offset = lseek(fd, *offset, whence);
 	if (*offset == -1)
 		return ret;
 	return 1;
@@ -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)
@@ -994,8 +993,14 @@ static void free_volatile_objects(const struct osl_table *t,
 	for (n = rb_first(&rb_col->rbtree); n; n = rb_next(n)) {
 		struct osl_row *r = get_row_pointer(n, rb_col->rbtree_num);
 		if (flags & OSL_FREE_VOLATILE)
-			for (j = 0; j < t->num_volatile_columns; j++)
-				free(r->volatile_objects[j].data);
+			FOR_EACH_VOLATILE_COLUMN(j, t, cd) {
+				if (cd->storage_flags & OSL_DONT_FREE)
+					continue;
+				free(r->volatile_objects[
+					t->columns[j].volatile_num].data);
+			}
+//			for (j = 0; j < t->num_volatile_columns; j++)
+//				free(r->volatile_objects[j].data);
 		free(r->volatile_objects);
 	}
 }
@@ -1443,8 +1448,10 @@ int osl_add_and_get_row(struct osl_table *t, struct osl_object *objects,
 	goto out;
 rollback: /* rollback all changes made, ignore further errors */
 	for (i--; i >= 0; i--) {
+		enum osl_storage_type st;
+
 		cd = get_column_description(t->desc, i);
-		enum osl_storage_type st = cd->storage_type;
+		st = cd->storage_type;
 		if (st == OSL_NO_STORAGE)
 			continue;
 
@@ -1569,7 +1576,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) {
@@ -2007,8 +2014,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);