cleanup previous commit

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index 86a660e9115903f63fc8a39281beac3239ff4cb1..bfec759303564a70f8fe79a41b29720daf7c040e 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -259,8 +259,8 @@ typedef struct ldapinfo_t {
 #define        LDAP_BACK_FQ_RETRYING   (2)
 
 #define        LDAP_BACK_QUARANTINE(li)        ( (li)->li_quarantine.ri_num != NULL )
-       ldap_back_quarantine_f  li_quarantine_func;
-       void                    *li_quarantine_arg;
+       ldap_back_quarantine_f  li_quarantine_f;
+       void                    *li_quarantine_p;
 
        time_t          li_network_timeout;
        time_t          li_conn_ttl;

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index a3f6e4adaed2d1a5287cd77969bce7a436ea340c..0f39c24c03d2724f62a32c911ae6590512ec46b9 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -885,9 +885,8 @@ ldap_back_quarantine(
                        "%s: ldap_back_quarantine exit.\n",
                        op->o_log_prefix, ri->ri_idx, ri->ri_count );
 
-               if ( li->li_quarantine_func ) {
-                       (void)li->li_quarantine_func( li,
-                               li->li_quarantine_arg );
+               if ( li->li_quarantine_f ) {
+                       (void)li->li_quarantine_f( li, li->li_quarantine_p );
                }
 
                ri->ri_count = 0;

diff --git a/servers/slapd/back-meta/back-meta.h b/servers/slapd/back-meta/back-meta.h
index 10ec708f96aaa65d845106ab90d527d83c7b9f3e..02fd4062e1466e57e9122ad3299fbd5db867f171 100644 (file)
--- a/servers/slapd/back-meta/back-meta.h
+++ b/servers/slapd/back-meta/back-meta.h
@@ -288,8 +288,8 @@ typedef struct metainfo_t {
        slap_retry_info_t       mi_quarantine;
 
 #define        META_BACK_QUARANTINE(mi)        ( (mi)->mi_quarantine.ri_num != NULL )
-       meta_back_quarantine_f  mi_quarantine_func;
-       meta_back_quarantine_f  mi_quarantine_arg;
+       meta_back_quarantine_f  mi_quarantine_f;
+       meta_back_quarantine_f  mi_quarantine_p;
 
        unsigned                mi_flags;
 #define        li_flags                mi_flags

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 1fff70a773e93674ecad61e17321e5754f39e0c9..d1300d8f1c5db68206a8d04dc43c5e6a8ed94fa4 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -1429,9 +1429,9 @@ meta_back_quarantine(
                        "%s: meta_back_quarantine exit.\n",
                        op->o_log_prefix, ri->ri_idx, ri->ri_count );
 
-               if ( mi->mi_quarantine_func ) {
-                       (void)mi->mi_quarantine_func( mi, candidate,
-                               mi->mi_quarantine_arg );
+               if ( mi->mi_quarantine_f ) {
+                       (void)mi->mi_quarantine_f( mi, candidate,
+                               mi->mi_quarantine_p );
                }
 
                ri->ri_count = 0;