r18921: Fix some c++ warnings.

Guenther
(This used to be commit b1bc7fd347978620eb8bc79dc253fab5b207a40b)

diff --git a/source3/iniparser/src/dictionary.c b/source3/iniparser/src/dictionary.c
index 4381b9cb78082946b3efd3a5d305ca08223f05ee..1f55cb4c244d64861dcc162ed62bb9beaae45d61 100644 (file)
--- a/source3/iniparser/src/dictionary.c
+++ b/source3/iniparser/src/dictionary.c
@@ -114,11 +114,11 @@ dictionary * dictionary_new(int size)
        /* If no size was specified, allocate space for DICTMINSZ */
        if (size<DICTMINSZ) size=DICTMINSZ ;
 
-       d = calloc(1, sizeof(dictionary));
+       d = (dictionary *)calloc(1, sizeof(dictionary));
        d->size = size ;
-       d->val  = calloc(size, sizeof(char*));
-       d->key  = calloc(size, sizeof(char*));
-       d->hash = calloc(size, sizeof(unsigned));
+       d->val  = (char **)calloc(size, sizeof(char*));
+       d->key  = (char **)calloc(size, sizeof(char*));
+       d->hash = (unsigned int *)calloc(size, sizeof(unsigned));
        return d ;
 }
 
@@ -316,9 +316,9 @@ void dictionary_set(dictionary * d, char * key, char * val)
        if (d->n==d->size) {
 
                /* Reached maximum size: reallocate blackboard */
-               d->val  = mem_double(d->val,  d->size * sizeof(char*)) ;
-               d->key  = mem_double(d->key,  d->size * sizeof(char*)) ;
-               d->hash = mem_double(d->hash, d->size * sizeof(unsigned)) ;
+               d->val  = (char **)mem_double(d->val,  d->size * sizeof(char*)) ;
+               d->key  = (char **)mem_double(d->key,  d->size * sizeof(char*)) ;
+               d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ;
 
                /* Double size */
                d->size *= 2 ;