From cf9fea9379e2ec3b29f239f10bb6c6bbaa2c4850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Mon, 11 Sep 2017 13:36:21 +0000 Subject: [PATCH] ITS#8731 Manual adjustment post doc/devel/variadic_debug/07-shortcut.cocci --- servers/slapd/back-asyncmeta/candidates.c | 2 -- servers/slapd/back-meta/candidates.c | 2 -- servers/slapd/back-meta/search.c | 8 -------- servers/slapd/back-sql/entry-id.c | 2 -- 4 files changed, 14 deletions(-) diff --git a/servers/slapd/back-asyncmeta/candidates.c b/servers/slapd/back-asyncmeta/candidates.c index c55e938289..b25832a7ac 100644 --- a/servers/slapd/back-asyncmeta/candidates.c +++ b/servers/slapd/back-asyncmeta/candidates.c @@ -258,8 +258,6 @@ asyncmeta_clear_one_msc( if ( msc->msc_ld != NULL ) { #ifdef DEBUG_205 - char buf[ BUFSIZ ]; - Debug(LDAP_DEBUG_ANY, "### %s asyncmeta_clear_one_msc ldap_unbind_ext[%d] ld=%p\n", op ? op->o_log_prefix : "", candidate, diff --git a/servers/slapd/back-meta/candidates.c b/servers/slapd/back-meta/candidates.c index 57d9ea64e9..c650459daf 100644 --- a/servers/slapd/back-meta/candidates.c +++ b/servers/slapd/back-meta/candidates.c @@ -254,8 +254,6 @@ meta_clear_one_candidate( if ( msc->msc_ld != NULL ) { #ifdef DEBUG_205 - char buf[ BUFSIZ ]; - Debug(LDAP_DEBUG_ANY, "### %s meta_clear_one_candidate ldap_unbind_ext[%d] mc=%p ld=%p\n", op ? op->o_log_prefix : "", candidate, (void *)mc, diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c index 092fa0cf33..b50a7cac6b 100644 --- a/servers/slapd/back-meta/search.c +++ b/servers/slapd/back-meta/search.c @@ -122,8 +122,6 @@ meta_search_dobind_init( /* another thread is binding the target for this conn; wait */ #ifdef DEBUG_205 - char buf[ SLAP_TEXT_BUFLEN ] = { '\0' }; - Debug(LDAP_DEBUG_ANY, "### %s meta_search_dobind_init[%d] mc=%p ld=%p needbind\n", op->o_log_prefix, candidate, (void *)mc, @@ -137,8 +135,6 @@ meta_search_dobind_init( /* we'll need to bind the target for this conn */ #ifdef DEBUG_205 - char buf[ SLAP_TEXT_BUFLEN ]; - Debug(LDAP_DEBUG_ANY, "### %s meta_search_dobind_init[%d] mc=%p ld=%p binding\n", op->o_log_prefix, candidate, (void *)mc, @@ -1740,8 +1736,6 @@ free_message:; /* if still binding, destroy */ #ifdef DEBUG_205 - char buf[ SLAP_TEXT_BUFLEN ]; - Debug(LDAP_DEBUG_ANY, "### %s meta_back_search(abandon) " "ldap_unbind_ext[%ld] mc=%p ld=%p\n", op->o_log_prefix, @@ -2133,8 +2127,6 @@ meta_send_entry( if ( slap_bv2undef_ad( &mapped, &attr->a_desc, &text, SLAP_AD_PROXIED ) != LDAP_SUCCESS ) { - char buf[ SLAP_TEXT_BUFLEN ]; - Debug(LDAP_DEBUG_ANY, "%s meta_send_entry(\"%s\"): " "slap_bv2undef_ad(%s): %s\n", op->o_log_prefix, ent.e_name.bv_val, diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c index 2cac48c84c..94cb8b95ff 100644 --- a/servers/slapd/back-sql/entry-id.c +++ b/servers/slapd/back-sql/entry-id.c @@ -813,8 +813,6 @@ backsql_get_attr_vals( void *v_at, void *v_bsi ) bsi->bsi_op->o_tmpmemctx ); if ( retval != LDAP_SUCCESS ) { - char buf[ SLAP_TEXT_BUFLEN ]; - /* FIXME: we're ignoring invalid values, * but we're accepting the attributes; * should we fail at all? */