ldap/servers/plugins/replication/repl5_replica_config.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
New commits: commit ab7bab02e7d240da9736290b7b35ee69f7b569b5 Author: Thierry bordaz (tbordaz) tbordaz@redhat.com Date: Wed Jun 5 14:49:20 2013 +0200
Compilation warnings (ticket 47350)
Bug Description: Get rid of the following warnings: repl5_replica_config.c:543:14: warning: variable 'r' set but not used [-Wunused-but-set-variable] repl5_replica_config.c:721: warning: implicit declaration of function 'valuearray_free' repl5_replica_config.c: In function 'replica_config_search': repl5_replica_config.c:799: warning: passing argument 2 of 'search_requested_attr' discards qualifiers from pointer target type repl5_replica_config.c:753: note: expected 'char *' but argument is of type 'const char *' repl5_replica_config.c:804: warning: passing argument 2 of 'search_requested_attr' discards qualifiers from pointer target type repl5_replica_config.c:753: note: expected 'char *' but argument is of type 'const char *'
Fix Description:
https://fedorahosted.org/389/ticket/47350
Reviewed by: Mark Reynolds
Platforms tested: fedora
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c index 9dc9169..58285f9 100644 --- a/ldap/servers/plugins/replication/repl5_replica_config.c +++ b/ldap/servers/plugins/replication/repl5_replica_config.c @@ -47,6 +47,7 @@ #include "repl5.h" #include "cl5_api.h" #include "cl5.h" +#include "slap.h"
/* CONFIG_BASE: no need to optimize */ #define CONFIG_BASE "cn=mapping tree,cn=config" @@ -540,7 +541,6 @@ replica_config_post_modify(Slapi_PBlock *pb, LDAPMod **mods; int i, apply_mods; multimaster_mtnode_extension *mtnode_ext; - Replica *r = NULL; char *replica_root = NULL; char buf [SLAPI_DSE_RETURNTEXT_SIZE]; char *errortext = returntext ? returntext : buf; @@ -587,8 +587,7 @@ replica_config_post_modify(Slapi_PBlock *pb, goto done; }
- r = object_get_data (mtnode_ext->replica); - PR_ASSERT (r); + PR_ASSERT (object_get_data (mtnode_ext->replica) != NULL);
slapi_pblock_get(pb, SLAPI_MODIFY_MODS, &mods); for (apply_mods = 0; apply_mods <= 1; apply_mods++) @@ -750,7 +749,7 @@ replica_config_search_ruv(Slapi_PBlock *pb, Slapi_Entry* e, Replica *replica) * else it returns PR_FALSE */ static PRBool -search_requested_attr(Slapi_PBlock *pb, char *attr) +search_requested_attr(Slapi_PBlock *pb, const char *attr) { char **attrs = NULL; int i;