Просмотр исходного кода

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).
Nathan Kinder 12 лет назад
Родитель
Сommit
cafc4eb7a1
2 измененных файлов с 2 добавлено и 4 удалено
  1. 0 2
      ldap/servers/slapd/pw.c
  2. 2 2
      lib/base/pool.cpp

+ 0 - 2
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));

+ 2 - 2
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);