ldap/servers/slapd/entry.c | 2 +-
ldap/servers/slapd/entrywsi.c | 3 ---
ldap/servers/slapd/valueset.c | 4 ++--
3 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 215741d21ce1ad89809ad4e7aa6cb972dde28116
Author: Ludwig Krispenz <lkrispen(a)redhat.com>
Date: Fri May 10 13:25:20 2013 +0200
Fix compiler warnings introduced by fix for #569
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index 6ca4c72..06815fb 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -1725,7 +1725,7 @@ entry2str_internal_put_attrlist( const Slapi_Attr *attrlist, int
attr_state, int
* never be seen by any client. It will never be moved to the
* present values and is only used to preserve the AD-csn
*/
- valueset_add_string (&a->a_deleted_values, "",
CSN_TYPE_VALUE_DELETED, a->a_deletioncsn);
+ valueset_add_string ((Slapi_ValueSet *)&a->a_deleted_values, "",
CSN_TYPE_VALUE_DELETED, a->a_deletioncsn);
}
entry2str_internal_put_valueset(a->a_type, a->a_deletioncsn,
CSN_TYPE_ATTRIBUTE_DELETED, attr_state, &a->a_deleted_values, VALUE_DELETED, ecur,
typebuf, typebuf_len, entry2str_ctrl);
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
index c786b87..af96039 100644
--- a/ldap/servers/slapd/entrywsi.c
+++ b/ldap/servers/slapd/entrywsi.c
@@ -46,8 +46,6 @@
#include "slap.h"
#include "slapi-plugin.h"
-static void resolve_attribute_state(Slapi_Entry *e, Slapi_Attr *a, int attribute_state,
int delete_priority);
-
static int
entry_present_value_to_deleted_value(Slapi_Attr *a, Slapi_Value *v)
{
@@ -776,7 +774,6 @@ entry_delete_present_values_wsi_multi_valued(Slapi_Entry *e, const
char *type, s
{
int retVal= LDAP_SUCCESS;
Slapi_Attr *a= NULL;
- int attr_state= entry_attr_find_wsi(e, type, &a);
/* The attribute is on the present list, or the deleted list and we're doing URP
*/
if ( vals == NULL || vals[0] == NULL )
{
diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c
index c041714..afde14b 100644
--- a/ldap/servers/slapd/valueset.c
+++ b/ldap/servers/slapd/valueset.c
@@ -1456,7 +1456,7 @@ valueset_update_csn_for_valuearray_ext(Slapi_ValueSet *vs, const
Slapi_Attr *a,
{
value_update_csn(vs->va[index],t,csn);
if (csnref_updated)
- valuestoupdate[i]->v_csnset = value_get_csnset(vs->va[index]);
+ valuestoupdate[i]->v_csnset = (CSNSet *)value_get_csnset(vs->va[index]);
valuearrayfast_add_value_passin(&vaf_valuesupdated,valuestoupdate[i]);
valuestoupdate[i] = NULL;
}
@@ -1473,7 +1473,7 @@ valueset_update_csn_for_valuearray_ext(Slapi_ValueSet *vs, const
Slapi_Attr *a,
{
value_update_csn(vs->va[index],t,csn);
if (csnref_updated)
- valuestoupdate[i]->v_csnset = value_get_csnset(vs->va[index]);
+ valuestoupdate[i]->v_csnset = (CSNSet *)value_get_csnset(vs->va[index]);
valuearrayfast_add_value_passin(&vaf_valuesupdated,valuestoupdate[i]);
valuestoupdate[i]= NULL;
}