From d188966c3f755fff80a80d3b242ad6c31231410f Mon Sep 17 00:00:00 2001 From: Ludwig Krispenz Date: Tue, 30 Jul 2013 13:52:02 +0200 Subject: [PATCH] distinguish between setting and adding a valueset valueset_add_valueset was assumin that vs1 is empty, and in two cases this is guranteed. There is on call actually adding a valueset, use slapi_attr_join_valueset in this place Rename valueset_add_valueset to valueset_set_valueset to avoid confusion --- ldap/servers/slapd/entrywsi.c | 2 +- ldap/servers/slapd/proto-slap.h | 2 +- ldap/servers/slapd/valueset.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c index c993950..f5f9db7 100644 --- a/ldap/servers/slapd/entrywsi.c +++ b/ldap/servers/slapd/entrywsi.c @@ -548,7 +548,7 @@ entry_delete_present_values_wsi(Slapi_Entry *e, const char *type, struct berval if(!slapi_attr_flag_is_set(a,SLAPI_ATTR_FLAG_SINGLE)) { /* We don't maintain a deleted value list for single valued attributes */ - valueset_add_valueset(&a->a_deleted_values, &a->a_present_values); /* JCM Would be better to passin the valuestodelete */ + slapi_valueset_join_attr_valueset(a, &a->a_deleted_values, &a->a_present_values); } slapi_valueset_done(&a->a_present_values); entry_present_attribute_to_deleted_attribute(e, a); diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h index cdcc952..60fa4e4 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -183,7 +183,7 @@ void valueset_add_valuearray(Slapi_ValueSet *vs, Slapi_Value **addvals); void valueset_add_valuearray_ext(Slapi_ValueSet *vs, Slapi_Value **addvals, PRUint32 flags); void valueset_add_string(const Slapi_Attr *a, Slapi_ValueSet *vs, const char *s, CSNType t, const CSN *csn); void valueset_update_csn(Slapi_ValueSet *vs, CSNType t, const CSN *csn); -void valueset_add_valueset(Slapi_ValueSet *vs1, const Slapi_ValueSet *vs2); +void valueset_set_valueset(Slapi_ValueSet *vs1, const Slapi_ValueSet *vs2); Slapi_ValueSet *valueset_dup(const Slapi_ValueSet *dupee); void valueset_remove_string(const Slapi_Attr *a, Slapi_ValueSet *vs, const char *s); int valueset_replace_valuearray(Slapi_Attr *a, Slapi_ValueSet *vs, Slapi_Value **vals); diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c index 2a664a1..17c6974 100644 --- a/ldap/servers/slapd/valueset.c +++ b/ldap/servers/slapd/valueset.c @@ -675,14 +675,14 @@ void slapi_valueset_set_valueset(Slapi_ValueSet *vs1, const Slapi_ValueSet *vs2) { slapi_valueset_init(vs1); - valueset_add_valueset(vs1,vs2); + valueset_set_valueset(vs1,vs2); } void slapi_valueset_join_attr_valueset(const Slapi_Attr *a, Slapi_ValueSet *vs1, const Slapi_ValueSet *vs2) { if (slapi_valueset_isempty(vs1)) - valueset_add_valueset(vs1,vs2); + valueset_set_valueset(vs1,vs2); else slapi_valueset_add_attr_valuearray_ext (a, vs1, vs2->va, vs2->num, 0, NULL); } @@ -1163,7 +1163,7 @@ valueset_add_string(const Slapi_Attr *a, Slapi_ValueSet *vs, const char *s, CSNT * The value set is passed in by value. */ void -valueset_add_valueset(Slapi_ValueSet *vs1, const Slapi_ValueSet *vs2) +valueset_set_valueset(Slapi_ValueSet *vs1, const Slapi_ValueSet *vs2) { int i; -- 1.7.11.7