This is an automated email from the git hooks/post-receive script.
mreynolds pushed a change to branch 389-ds-base-1.3.6
in repository 389-ds-base.
from 3c8c692 Ticket 49401 - improve valueset sorted performance on delete
new e6ac5ec Ticket 49401 - Fix compiler incompatible-pointer-types warnings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
ldap/servers/slapd/valueset.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
Show replies by thread
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.3.6
in repository 389-ds-base.
commit e6ac5ec0695a7a2766bfb0584d029d20d9940527
Author: Mohammad Nweider <nweiderm(a)amazon.com>
Date: Wed Oct 25 16:26:54 2017 +0000
Ticket 49401 - Fix compiler incompatible-pointer-types warnings
Bug Description: vs->sorted was integer pointer in older versions,
but now it's size_t pointer, this is causing compiler warnings
during the build
Fix Description: use size_t pointers instead of integer pointers for vs->sorted and
sorted2
Review By: mreynolds
Signed-off-by: Mark Reynolds <mreynolds(a)redhat.com>
(cherry picked from commit 52ba2aba49935989152010aee0d40b01d7a78432)
---
ldap/servers/slapd/valueset.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c
index ae0a13f..8730d9f 100644
--- a/ldap/servers/slapd/valueset.c
+++ b/ldap/servers/slapd/valueset.c
@@ -744,7 +744,7 @@ valueset_array_purge(const Slapi_Attr *a, Slapi_ValueSet *vs, const
CSN *csn)
int nv = 0;
int numValues = 0;
Slapi_Value **va2 = NULL;
- int *sorted2 = NULL;
+ size_t *sorted2 = NULL;
/* Loop over all the values freeing the old ones. */
for(i = 0; i < vs->num; i++)
@@ -814,7 +814,7 @@ valueset_array_purge(const Slapi_Attr *a, Slapi_ValueSet *vs, const
CSN *csn)
if(vs->sorted) {
/* Let's allocate va2 and sorted2 */
va2 = (Slapi_Value **) slapi_ch_malloc( (numValues + 1) * sizeof(Slapi_Value
*));
- sorted2 = (int *) slapi_ch_malloc( (numValues + 1)* sizeof(int));
+ sorted2 = (size_t *) slapi_ch_malloc( (numValues + 1)* sizeof(size_t));
}
/* I is the index for the *new* va2 array */
@@ -868,7 +868,7 @@ valueset_array_purge(const Slapi_Attr *a, Slapi_ValueSet *vs, const
CSN *csn)
/* We still have values but not sorted array! rebuild it */
if(vs->num > VALUESET_ARRAY_SORT_THRESHOLD && vs->sorted == NULL) {
- vs->sorted = (int *) slapi_ch_malloc( vs->max* sizeof(int));
+ vs->sorted = (size_t *) slapi_ch_malloc( vs->max* sizeof(size_t));
valueset_array_to_sorted(a, vs);
}
#ifdef DEBUG
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.