From e0174e98e7baed3a18802f90996107ea706fa747 Mon Sep 17 00:00:00 2001 From: Ludwig Krispenz Date: Tue, 13 Feb 2018 12:23:50 +0100 Subject: [PATCH] fix compiler warning for const csn --- ldap/servers/plugins/replication/repl5_replica.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c index e537928..5473d5b 100644 --- a/ldap/servers/plugins/replication/repl5_replica.c +++ b/ldap/servers/plugins/replication/repl5_replica.c @@ -3003,7 +3003,7 @@ process_reap_entry(Slapi_Entry *entry, void *cb_data) if the value is set in the replica, we will know about it immediately */ PRBool *tombstone_reap_stop = ((reap_callback_data *)cb_data)->tombstone_reap_stop; const CSN *deletion_csn = NULL; - int deletion_csn_free = 0; + CSN *tombstone_csn = NULL; int rc = -1; /* abort reaping if we've been told to stop or we're shutting down */ @@ -3023,11 +3023,11 @@ process_reap_entry(Slapi_Entry *entry, void *cb_data) /* this might be a tombstone which was directly added, eg a cenotaph * check if a tombstonecsn exist and use it */ - char *tombstonecsn = slapi_entry_attr_get_charptr(entry, SLAPI_ATTR_TOMBSTONE_CSN); - if (tombstonecsn) { - deletion_csn = csn_new_by_string(tombstonecsn); - deletion_csn_free = 1; - slapi_ch_free_string(&tombstonecsn); + char *tombstonecsn_str = slapi_entry_attr_get_charptr(entry, SLAPI_ATTR_TOMBSTONE_CSN); + if (tombstonecsn_str) { + tombstone_csn = csn_new_by_string(tombstonecsn_str); + deletion_csn = tombstone_csn; + slapi_ch_free_string(&tombstonecsn_str); } } @@ -3059,8 +3059,8 @@ process_reap_entry(Slapi_Entry *entry, void *cb_data) /* Don't update the count for the database tombstone entry */ (*num_entriesp)++; } - if (deletion_csn_free) { - csn_free(&deletion_csn); + if (tombstone_csn) { + csn_free(&tombstone_csn); } return 0; -- 2.9.5