VERSION.sh | 2 +-
lib/base/pool.cpp | 10 +++++-----
lib/base/system.cpp | 8 ++++----
lib/libaccess/aclcache.cpp | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 64d91edb10c9239f40b2f891158c4976a2115e50
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Mar 10 18:00:11 2014 -0700
Bump version to 1.3.2.14
diff --git a/VERSION.sh b/VERSION.sh
index d044896..68555f3 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=3
-VERSION_MAINT=2.13
+VERSION_MAINT=2.14
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
commit 48ee1efc2cbed191bc6e18c9d4e5566da71c9fb4
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Mar 10 17:57:48 2014 -0700
Revert "Ticket 47700 - Fix compiler warnings"
This reverts commit ad4f230c5b40ba7462098a922170edc5f33283d1.
diff --git a/lib/base/pool.cpp b/lib/base/pool.cpp
index f085e4a..433fc58 100644
--- a/lib/base/pool.cpp
+++ b/lib/base/pool.cpp
@@ -178,7 +178,7 @@ _create_block(int size)
crit_exit(freelist_lock);
if (((newblock = (block_t *)PERM_MALLOC(sizeof(block_t))) == NULL) ||
((newblock->data = (char *)PERM_MALLOC(bytes)) == NULL)) {
- ereport(LOG_CATASTROPHE, (char *)XP_GetAdminStr(DBT_poolCreateBlockOutOfMemory_));
+ ereport(LOG_CATASTROPHE, "%s",
XP_GetAdminStr(DBT_poolCreateBlockOutOfMemory_));
if (newblock)
PERM_FREE(newblock);
return NULL;
@@ -270,7 +270,7 @@ pool_create()
}
if ( (newpool->curr_block =_create_block(BLOCK_SIZE)) == NULL) {
- ereport(LOG_CATASTROPHE, (char *)XP_GetAdminStr(DBT_poolCreateOutOfMemory_));
+ ereport(LOG_CATASTROPHE, "%s", XP_GetAdminStr(DBT_poolCreateOutOfMemory_));
PERM_FREE(newpool);
return NULL;
}
@@ -291,7 +291,7 @@ pool_create()
crit_exit(known_pools_lock);
}
else
- ereport(LOG_CATASTROPHE, (char *)XP_GetAdminStr(DBT_poolCreateOutOfMemory_1));
+ ereport(LOG_CATASTROPHE, "%s", XP_GetAdminStr(DBT_poolCreateOutOfMemory_1));
return (pool_handle_t *)newpool;
}
@@ -388,7 +388,7 @@ pool_malloc(pool_handle_t *pool_handle, size_t size)
*/
blocksize = ( (size + BLOCK_SIZE-1) / BLOCK_SIZE ) * BLOCK_SIZE;
if ( (pool->curr_block = _create_block(blocksize)) == NULL) {
- ereport(LOG_CATASTROPHE, (char *)XP_GetAdminStr(DBT_poolMallocOutOfMemory_));
+ ereport(LOG_CATASTROPHE, "%s", XP_GetAdminStr(DBT_poolMallocOutOfMemory_));
#ifdef POOL_LOCKING
crit_exit(pool->lock);
#endif
@@ -410,7 +410,7 @@ pool_malloc(pool_handle_t *pool_handle, size_t size)
void _pool_free_error()
{
- ereport(LOG_WARN, (char *)XP_GetAdminStr(DBT_freeUsedWherePermFreeShouldHaveB_));
+ ereport(LOG_WARN, "%s",
XP_GetAdminStr(DBT_freeUsedWherePermFreeShouldHaveB_));
return;
}
diff --git a/lib/base/system.cpp b/lib/base/system.cpp
index b62a814..287d5a8 100644
--- a/lib/base/system.cpp
+++ b/lib/base/system.cpp
@@ -201,7 +201,7 @@ NSAPI_PUBLIC void *system_realloc_perm(void *ptr, int size)
return ptr;
}
} else {
- ereport(LOG_WARN, (char*)"realloc: attempt to realloc to smaller
size");
+ ereport(LOG_WARN, "realloc: attempt to realloc to smaller size");
return realloc(ptr, size);
}
@@ -228,20 +228,20 @@ NSAPI_PUBLIC void system_free_perm(void *ptr)
cptr += sizeof(int);
for (index=0; index<DEBUG_MARGIN; index++)
if (cptr[index] != DEBUG_MARGIN_CHAR) {
- ereport(LOG_CATASTROPHE, (char *)"free: corrupt memory (prebounds
overwrite)");
+ ereport(LOG_CATASTROPHE, "free: corrupt memory (prebounds
overwrite)");
break;
}
cptr += DEBUG_MARGIN + *length;
for (index=0; index<DEBUG_MARGIN; index++)
if (cptr[index] != DEBUG_MARGIN_CHAR) {
- ereport(LOG_CATASTROPHE, (char *)"free: corrupt memory (prebounds
overwrite)");
+ ereport(LOG_CATASTROPHE, "free: corrupt memory (prebounds
overwrite)");
break;
}
memset(baseptr, DEBUG_FREE_CHAR, *length + 2*DEBUG_MARGIN+sizeof(int));
} else {
- ereport(LOG_CATASTROPHE, (char *)"free: freeing unallocated memory");
+ ereport(LOG_CATASTROPHE, "free: freeing unallocated memory");
}
free(baseptr);
#else
diff --git a/lib/libaccess/aclcache.cpp b/lib/libaccess/aclcache.cpp
index 8f58344..f814df7 100644
--- a/lib/libaccess/aclcache.cpp
+++ b/lib/libaccess/aclcache.cpp
@@ -133,8 +133,8 @@ ACL_ListHashInit()
&ACLPermAllocOps,
NULL);
if (ACLListHash == NULL) {
- ereport(LOG_SECURITY, (char *)"Unable to allocate ACL List Hash");
- return;
+ ereport(LOG_SECURITY, "Unable to allocate ACL List Hash\n");
+ return;
}
return;