X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=osl.c;h=ff588713b320aad0ef7e80a5258ac80f0c148622;hp=bc6956e9958a01aa3457806e5ac7efac7bf6cad8;hb=ac153fd54a0f093581ee863984070a325d5343b8;hpb=0a3b9b83c371c71e41ba8470affef0fa0a7fba08 diff --git a/osl.c b/osl.c index bc6956e9..ff588713 100644 --- a/osl.c +++ b/osl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * 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; @@ -1448,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;