Blob Blame Raw
From 43c73ca572af6a4bdc9b5994a9640f4d4e713cc2 Mon Sep 17 00:00:00 2001
From: Mohammad Nweider <nweiderm@amazon.com>
Date: Wed, 25 Oct 2017 16:26:54 +0000
Subject: [PATCH] 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@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 ae0a13fdc..8730d9f56 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
-- 
2.13.6