From f73f022e80e0518903fed9525f5f3e22879d9adf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Feb 2013 19:27:45 +0100 Subject: [PATCH] libconfigfile/config.c, libmpools/mpools.c: don't pass (const void *) to free(2) --- libconfigfile/config.c | 6 +++--- libmpools/mpools.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libconfigfile/config.c b/libconfigfile/config.c index 0e74c88..d7270c2 100644 --- a/libconfigfile/config.c +++ b/libconfigfile/config.c @@ -243,8 +243,8 @@ FreeConfig(const char * filename) if (node == NULL) return; - free(getNodeData(node)); - free(getNodeKey(node)); + free((void*)getNodeData(node)); + free((void*)getNodeKey(node)); RemoveNode(node); FreeNode(node); } @@ -335,7 +335,7 @@ GetConfig(const char * filename, char * keyword) result_buf = strdup(p); if (result_buf == NULL) { - syslog(LOG_ERR, "GetConfig: Failed to allocate %d byte of memory.", strlen(p)); + syslog(LOG_ERR, "GetConfig: Failed to allocate memory for parameter buffer."); errno = ENOMEM; return NULL; } diff --git a/libmpools/mpools.c b/libmpools/mpools.c index dbf94ad..fdd394c 100644 --- a/libmpools/mpools.c +++ b/libmpools/mpools.c @@ -60,7 +60,7 @@ GetMemoryPool(const char * pool_name, node = AppendNode(mpools_list, (const void *) pool_name, NULL); if (node == NULL) { - free(pool_name); + free((void*)pool_name); return -1; } @@ -301,7 +301,7 @@ mp_free_memory_pool(const char * pool_name /* ID-String of the memory pool. */ /* And now we move the pool completely. */ RemoveNode(node); - free(getNodeKey(node)); /* kill the pool name buffer */ + free((void*)getNodeKey(node)); /* kill the pool name buffer */ FreeNode(node); for ( ; mpool_entry != NULL; mpool_entry = next_mpool_entry) {