|
 |
dc8c34 |
From c9985217378cba90d83101d12bc462637e730ad8 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Wed, 31 Jul 2013 10:52:21 -0600
|
|
|
dc8c34 |
Subject: [PATCH 169/225] fix coverity 11915 - dead code - introduced with fix
|
|
|
dc8c34 |
for ticket 346
|
|
|
dc8c34 |
|
|
|
dc8c34 |
just get rid of unused variable was_present_null
|
|
|
dc8c34 |
reviewed by: nhosoi (Thanks!)
|
|
|
dc8c34 |
(cherry picked from commit ba70aac1991a04455ba83362e22c33f7f6ab227a)
|
|
|
dc8c34 |
(cherry picked from commit fcf4154b73681752a5ac32954a1d25771a75478e)
|
|
|
dc8c34 |
(cherry picked from commit 8a6b75fefccb9daf238d26fcc6f320d4505f8251)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/attr.c | 3 +--
|
|
|
dc8c34 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c
|
|
|
dc8c34 |
index 9894393..983e286 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/attr.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/attr.c
|
|
|
dc8c34 |
@@ -811,7 +811,6 @@ attr_add_valuearray(Slapi_Attr *a, Slapi_Value **vals, const char *dn)
|
|
|
dc8c34 |
int i = 0;
|
|
|
dc8c34 |
int numofvals = 0;
|
|
|
dc8c34 |
int duplicate_index = -1;
|
|
|
dc8c34 |
- int was_present_null = 0;
|
|
|
dc8c34 |
int rc = LDAP_SUCCESS;
|
|
|
dc8c34 |
|
|
|
dc8c34 |
if (valuearray_isempty(vals)) {
|
|
|
dc8c34 |
@@ -868,7 +867,7 @@ attr_add_valuearray(Slapi_Attr *a, Slapi_Value **vals, const char *dn)
|
|
|
dc8c34 |
duplicate_string,
|
|
|
dc8c34 |
a->a_type,
|
|
|
dc8c34 |
dn ? dn : "<null>",
|
|
|
dc8c34 |
- (was_present_null ? "duplicate new value" : "value exists"));
|
|
|
dc8c34 |
+ "value exists");
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
return( rc );
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|