drop_privileges_or_die(): Check return value of setuid().

[paraslash.git] / osl.c

diff --git a/osl.c b/osl.c
index bc6956e9958a01aa3457806e5ac7efac7bf6cad8..e2c1ef46f40624adddf6dd7611e07ec2a9f97ef8 100644 (file)
--- a/osl.c
+++ b/osl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 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;
@@ -312,7 +312,6 @@ static int init_column_descriptions(struct osl_table *t)
        int i, j, ret;
        const struct osl_column_description *cd;
 
-       ret = -E_BAD_TABLE_DESC;
        ret = verify_name(t->desc->name);
        if (ret < 0)
                goto err;
@@ -1448,8 +1447,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;