From 4f6a396fcf16f97b2abc3d0cba10e9aa9bc38619 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@redhat.com>
Date: Thu, 2 Sep 2010 14:35:58 +0200
Subject: Dead assignments cleanup in various places in SSSD

Three assignments deleted, two return code inspection added.
Also found and fixed one critical bug caused by dead assignment.
Ticket: #590
---
 src/confdb/confdb.c       | 1 -
 src/confdb/confdb_setup.c | 5 +----
 src/db/sysdb.c            | 3 +++
 src/monitor/monitor.c     | 3 +++
 src/util/backup_file.c    | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
index 877b80ac7..eebc2cd3d 100644
--- a/src/confdb/confdb.c
+++ b/src/confdb/confdb.c
@@ -862,7 +862,6 @@ int confdb_get_domains(struct confdb_ctx *cdb,
         if (ret) {
             DEBUG(0, ("Error (%d [%s]) retrieving domain [%s], skipping!\n",
                       ret, strerror(ret), domlist[i]));
-            ret = EOK;
             continue;
         }
 
diff --git a/src/confdb/confdb_setup.c b/src/confdb/confdb_setup.c
index b2ac7e163..f98a69772 100644
--- a/src/confdb/confdb_setup.c
+++ b/src/confdb/confdb_setup.c
@@ -133,7 +133,6 @@ static int confdb_create_ldif(TALLOC_CTX *mem_ctx,
     int ret, i, j;
     char *ldif;
     char *tmp_ldif;
-    char *writer;
     char **sections;
     int section_count;
     char *dn;
@@ -159,7 +158,6 @@ static int confdb_create_ldif(TALLOC_CTX *mem_ctx,
     }
 
     memcpy(ldif, CONFDB_INTERNAL_LDIF, ldif_len);
-    writer = ldif+ldif_len;
 
     /* Read in the collection and convert it to an LDIF */
     /* Get the list of sections */
@@ -273,7 +271,7 @@ error:
 
 int confdb_init_db(const char *config_file, struct confdb_ctx *cdb)
 {
-    int ret, i;
+    int ret;
     int fd = -1;
     struct collection_item *sssd_config = NULL;
     struct collection_item *error_list = NULL;
@@ -397,7 +395,6 @@ int confdb_init_db(const char *config_file, struct confdb_ctx *cdb)
 
     DEBUG(7, ("LDIF file to import: \n%s", config_ldif));
 
-    i=0;
     while ((ldif = ldb_ldif_read_string(cdb->ldb, (const char **)&config_ldif))) {
         ret = ldb_add(cdb->ldb, ldif->msg);
         if (ret != LDB_SUCCESS) {
diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index 5a7626f46..4e1243c08 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -193,6 +193,9 @@ int sysdb_attrs_add_val(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/monitor/monitor.c b/src/monitor/monitor.c
index caf405612..1c2a058e5 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -981,6 +981,9 @@ static int add_new_service(struct mt_ctx *ctx, const char *name)
     struct mt_svc *svc;
 
     ret = get_service_config(ctx, name, &svc);
+    if (ret != EOK) {
+        return ret;
+    }
 
     ret = start_service(svc);
     if (ret != EOK) {
diff --git a/src/util/backup_file.c b/src/util/backup_file.c
index 990793278..fb1604b9e 100644
--- a/src/util/backup_file.c
+++ b/src/util/backup_file.c
@@ -96,8 +96,8 @@ int backup_file(const char *src_file, int dbglvl)
 
         count = num;
 
+        pos = 0;
         while (count > 0) {
-            pos = 0;
             errno = 0;
             num = write(dst_fd, &buf[pos], count);
             if (num < 0) {
-- 
cgit