andykimpe / rpms / 389-ds-base

Forked from rpms/389-ds-base 4 months ago
Clone
Blob Blame History Raw
From a56e266c80ed587d4b622b1c7247b4f8fb081eb1 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Wed, 31 Jul 2013 10:52:21 -0600
Subject: [PATCH 98/99] fix coverity 11915 - dead code - introduced with fix
 for ticket 346

just get rid of unused variable was_present_null
reviewed by: nhosoi (Thanks!)
(cherry picked from commit ba70aac1991a04455ba83362e22c33f7f6ab227a)
(cherry picked from commit fcf4154b73681752a5ac32954a1d25771a75478e)
(cherry picked from commit 67694e7a95f72067bba84e0f6af4ff1c4af89a9e)
(cherry picked from commit dc9192efc1c502e53e54291a8afda33f56a97d03)
---
 ldap/servers/slapd/attr.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c
index 87dfe1e..ed6d8de 100644
--- a/ldap/servers/slapd/attr.c
+++ b/ldap/servers/slapd/attr.c
@@ -767,7 +767,6 @@ attr_add_valuearray(Slapi_Attr *a, Slapi_Value **vals, const char *dn)
     int i = 0;
     int numofvals = 0;
     int duplicate_index = -1;
-    int was_present_null = 0;
     int rc = LDAP_SUCCESS;
 
     if (valuearray_isempty(vals)) {
@@ -866,7 +865,7 @@ attr_add_valuearray(Slapi_Attr *a, Slapi_Value **vals, const char *dn)
                 duplicate_string,
                 a->a_type,
                 dn ? dn : "<null>", 
-                (was_present_null ? "duplicate new value" : "value exists"));
+                "value exists");
     }
     return( rc );
 }
-- 
1.8.1.4