From b1698ee33926e44885f5d24b7aa53805b17e0e3f Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 25 Jun 2018 12:25:17 -0400
Subject: [PATCH] C type fixes.

---
 platform-independent/c/core/src/mpw-util.c | 10 +++++-----
 platform-independent/c/core/src/mpw-util.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform-independent/c/core/src/mpw-util.c b/platform-independent/c/core/src/mpw-util.c
index 96cf284e..e103e65d 100644
--- a/platform-independent/c/core/src/mpw-util.c
+++ b/platform-independent/c/core/src/mpw-util.c
@@ -66,9 +66,9 @@ const char **mpw_strings(size_t *count, const char *strings, ...) {
 
     va_list args;
     va_start( args, strings );
-    char **array = NULL;
+    const char **array = NULL;
     size_t arraySize = 0;
-    for (const char *string; string = va_arg( args, const char * );) {
+    for (const char *string; (string = va_arg( args, const char * ));) {
         size_t cursor = arraySize;
         if (!mpw_realloc( &array, &arraySize, sizeof(string) )) {
             mpw_free( &array, arraySize );
@@ -311,7 +311,7 @@ static uint8_t const *mpw_aes(bool encrypt, const uint8_t *key, const size_t key
         AES_CBC_encrypt_buffer( resultBuf, aesBuf, aesSize, key, iv );
     else
         AES_CBC_decrypt_buffer( resultBuf, aesBuf, aesSize, key, iv );
-    mpw_free( aesBuf, aesSize );
+    mpw_free( &aesBuf, aesSize );
 
     // Truncate PKCS#7 padding
     if (encrypt)
@@ -516,7 +516,7 @@ char *mpw_strndup(const char *src, size_t max) {
     return dst;
 }
 
-int *mpw_strncasecmp(const char *s1, const char *s2, size_t max) {
+int mpw_strncasecmp(const char *s1, const char *s2, size_t max) {
 
     if (s1 && s2 && max)
         for (; --max > 0; ++s1, ++s2) {
@@ -526,4 +526,4 @@ int *mpw_strncasecmp(const char *s1, const char *s2, size_t max) {
         }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/platform-independent/c/core/src/mpw-util.h b/platform-independent/c/core/src/mpw-util.h
index a2d19baf..bf95b6cb 100644
--- a/platform-independent/c/core/src/mpw-util.h
+++ b/platform-independent/c/core/src/mpw-util.h
@@ -216,6 +216,6 @@ char *mpw_strdup(const char *src);
 /** Drop-in for POSIX strndup(3). */
 char *mpw_strndup(const char *src, size_t max);
 /** Drop-in for POSIX strncasecmp(3). */
-int *mpw_strncasecmp(const char *s1, const char *s2, size_t max);
+int mpw_strncasecmp(const char *s1, const char *s2, size_t max);
 
 #endif // _MPW_UTIL_H