gre-ilya/petidomo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libconfigfile/config.c, libmpools/mpools.c: don't pass (const void *) to free(2)

Browse Source
This commit is contained in:
Peter Simons 2013-02-09 19:27:45 +01:00
parent 0aa1e2f602
commit f73f022e80
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libconfigfile/config.c
View File

@ -243,8 +243,8 @@ FreeConfig(const char * filename)
if (node == NULL) if (node == NULL)
return; return;
free(getNodeData(node)); free((void*)getNodeData(node));
free(getNodeKey(node)); free((void*)getNodeKey(node));
RemoveNode(node); RemoveNode(node);
FreeNode(node); FreeNode(node);
} }
@ -335,7 +335,7 @@ GetConfig(const char * filename, char * keyword)
result_buf = strdup(p); result_buf = strdup(p);
if (result_buf == NULL) { 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; errno = ENOMEM;
return NULL; return NULL;
} }

4
libmpools/mpools.c
View File

@ -60,7 +60,7 @@ GetMemoryPool(const char * pool_name,
node = AppendNode(mpools_list, (const void *) pool_name, NULL); node = AppendNode(mpools_list, (const void *) pool_name, NULL);
if (node == NULL) { if (node == NULL) {
free(pool_name); free((void*)pool_name);
return -1; 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. */ /* And now we move the pool completely. */
RemoveNode(node); RemoveNode(node);
free(getNodeKey(node)); /* kill the pool name buffer */ free((void*)getNodeKey(node)); /* kill the pool name buffer */
FreeNode(node); FreeNode(node);
for ( ; mpool_entry != NULL; mpool_entry = next_mpool_entry) { for ( ; mpool_entry != NULL; mpool_entry = next_mpool_entry) {