ITS#8731 Manual adjustment post doc/devel/variadic_debug/07-shortcut.cocci

diff --git a/servers/slapd/back-asyncmeta/candidates.c b/servers/slapd/back-asyncmeta/candidates.c
index c55e9382894bc12e3e90db1e28d284ba8faea3a0..b25832a7ac8866dfe1cf97a77a22f0de5b9ba037 100644 (file)
--- 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 57d9ea64e970ea91ead0a2c1f573acbb2260f329..c650459daf334acfca69cd91a15c7b8e5ebfa182 100644 (file)
--- 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 092fa0cf335122118ce0753babbf3f11276944db..b50a7cac6bad8c3c6258d40c749489dd4d025be3 100644 (file)
--- 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 2cac48c84c1378dc2d8cdbc683d85d5f420e02e6..94cb8b95ffe65f59a625be99a0929ee0d43a3b5e 100644 (file)
--- 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? */