ldap/servers/slapd/pw.c | 2 --
lib/base/pool.cpp | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit e93308ef1255e19312482c6271f7befd0d98e151
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Fri Nov 8 11:01:19 2013 -0800
Ticket 47588 - Compiler warnings building on F19
This addresses a few compiler warnings that show up when building
on F19. The issues are minor (unused typedef and an incorrect
usage of memset in some debugging ifdef'd code).
(cherry picked from commit cafc4eb7a16e5ee4b90922fa0000e86d35290030)
(cherry picked from commit 3cf9c544585385a9b7eecfbcb79ce1fbc4ebccfa)
diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
index eb4ebd4..28302b0 100644
--- a/ldap/servers/slapd/pw.c
+++ b/ldap/servers/slapd/pw.c
@@ -447,7 +447,6 @@ pw_rever_decode(char *cipher, char **plain, const char * attr_name)
{
if (slapi_attr_types_equivalent(L_attr, attr_name))
{
- typedef int (*CMPFP)(char *, char *);
typedef char * (*ENCFP)(char *);
pwsp = (struct pw_scheme *) slapi_ch_calloc (1, sizeof(struct pw_scheme));
@@ -523,7 +522,6 @@ pw_rever_encode(Slapi_Value **vals, char * attr_name)
{
if (slapi_attr_types_equivalent(L_attr, attr_name))
{
- typedef int (*CMPFP)(char *, char *);
typedef char * (*ENCFP)(char *);
pwsp = (struct pw_scheme *) slapi_ch_calloc (1, sizeof(struct pw_scheme));
diff --git a/lib/base/pool.cpp b/lib/base/pool.cpp
index 657e8c6..433fc58 100644
--- a/lib/base/pool.cpp
+++ b/lib/base/pool.cpp
@@ -209,7 +209,7 @@ _free_block(block_t *block)
PERM_FREE(block->data);
#ifdef POOL_ZERO_DEBUG
- memset(block, 0xa, sizeof(block));
+ memset(block, 0xa, sizeof(block_t));
#endif /* POOL_ZERO_DEBUG */
PERM_FREE(block);
@@ -340,7 +340,7 @@ pool_destroy(pool_handle_t *pool_handle)
crit_exit(known_pools_lock);
#ifdef POOL_ZERO_DEBUG
- memset(pool, 0xa, sizeof(pool));
+ memset(pool, 0xa, sizeof(pool_t));
#endif /* POOL_ZERO_DEBUG */
PERM_FREE(pool);
Show replies by date