summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2010-09-08 15:55:06 -0700
committerNathan Kinder <nkinder@redhat.com>2010-09-09 13:40:36 -0700
commit47b3843284870848adc15bc4ab603f2cf0e5c7f7 (patch)
treec6a6e0867da16bb1f1c2905dc9bd677e037ece03
parent197c1d7381e6eb455210e2a785525c2b45b0e32a (diff)
downloadds-47b3843284870848adc15bc4ab603f2cf0e5c7f7.tar.gz
ds-47b3843284870848adc15bc4ab603f2cf0e5c7f7.tar.xz
ds-47b3843284870848adc15bc4ab603f2cf0e5c7f7.zip
Bug 630094 - (cov#15457) Remove deadcode in import code
The skipit variable is set to zero shortly before we check if it is 0 in an if condition. This if block can be removed since it will never be hit. The entry that was being freed in the if block is already removed earlier in the function if skipit was non-0 prior to resetting skipit to 0.
-rw-r--r--ldap/servers/slapd/back-ldbm/import-threads.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 7bdf32f7..1fc269b9 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -1613,10 +1613,6 @@ upgradedn_producer(void *param)
}
}
upgradedn_free_list(&ud_list);
- if (skipit) {
- slapi_entry_free(e); e = NULL;
- continue;
- }
ep = import_make_backentry(e, temp_id);
if (!ep || !ep->ep_entry) {