From 1395f8988e43b792c577fd56e84aa6a0b5c0d334 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 10 Feb 2011 14:24:19 -0500
Subject: Clear up -Wunused-but-set-variable warnings

---
 src/db/sysdb.c             | 3 +++
 src/ldb_modules/memberof.c | 7 -------
 src/tests/stress-tests.c   | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index 388295a06..d6c66e9e3 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -484,6 +484,9 @@ int sysdb_attrs_steal_string(struct sysdb_attrs *attrs,
     int ret;
 
     ret = sysdb_attrs_get_el(attrs, name, &el);
+    if (ret != EOK) {
+        return ret;
+    }
 
     vals = talloc_realloc(attrs->a, el->values,
                           struct ldb_val, el->num_values+1);
diff --git a/src/ldb_modules/memberof.c b/src/ldb_modules/memberof.c
index b55ba1d2c..4fc46fa84 100644
--- a/src/ldb_modules/memberof.c
+++ b/src/ldb_modules/memberof.c
@@ -1733,16 +1733,9 @@ static int mbof_del_exop_search_callback(struct ldb_request *req,
 static int mbof_del_execute_cont(struct mbof_del_operation *delop)
 {
     struct mbof_del_ancestors_ctx *anc_ctx;
-    struct mbof_del_operation *parent;
-    struct mbof_del_ctx *del_ctx;
-    struct mbof_ctx *ctx;
     struct mbof_dn_array *new_list;
     int i;
 
-    del_ctx = delop->del_ctx;
-    parent = delop->parent;
-    ctx = del_ctx->ctx;
-
     anc_ctx = talloc_zero(delop, struct mbof_del_ancestors_ctx);
     if (!anc_ctx) {
         return LDB_ERR_OPERATIONS_ERROR;
diff --git a/src/tests/stress-tests.c b/src/tests/stress-tests.c
index 5075348e1..e34f910ad 100644
--- a/src/tests/stress-tests.c
+++ b/src/tests/stress-tests.c
@@ -59,7 +59,7 @@ int test_lookup_user(const char *name, int enoent_fail)
     pwd = getpwnam(name);
     error = errno;
     if (pwd == NULL) {
-        if (errno == 0 || errno == ENOENT) {
+        if (error == 0 || error == ENOENT) {
             ret = (enoent_fail == 1) ? ENOENT : 0;
         }
     }
-- 
cgit