Cleanup SLAPI namespace

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 1b06371da821674d3c5ce44ab404ad37d4635012..563b33800be3b63af33341ffc6ef15b023d74878 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -35,10 +35,10 @@
 
 #ifdef LDAP_SLAPI
 #include "slapi.h"
-static void initAddPlugin( Operation *op,
+static void init_add_pblock( Operation *op,
        struct berval *dn, Entry *e, int manageDSAit );
-static int doPreAddPluginFNs( Operation *op );
-static void doPostAddPluginFNs( Operation *op );
+static int call_add_preop_plugins( Operation *op );
+static void call_add_postop_plugins( Operation *op );
 #endif /* LDAP_SLAPI */
 
 int
@@ -239,7 +239,7 @@ do_add( Operation *op, SlapReply *rs )
        }
 
 #ifdef LDAP_SLAPI
-       if ( op->o_pb ) initAddPlugin( op, &dn, e, manageDSAit );
+       if ( op->o_pb ) init_add_pblock( op, &dn, e, manageDSAit );
 #endif /* LDAP_SLAPI */
 
        /*
@@ -300,7 +300,7 @@ do_add( Operation *op, SlapReply *rs )
                         * will actually contain something.
                         */
                        if ( op->o_pb ) {
-                               rs->sr_err = doPreAddPluginFNs( op );
+                               rs->sr_err = call_add_preop_plugins( op );
                                if ( rs->sr_err != LDAP_SUCCESS ) {
                                        /* plugin will have sent result */
                                        goto done;
@@ -330,7 +330,7 @@ do_add( Operation *op, SlapReply *rs )
                         * on replicas (for now, it involves the minimum code intrusion).
                         */
                        if ( op->o_pb ) {
-                               rs->sr_err = doPreAddPluginFNs( op );
+                               rs->sr_err = call_add_preop_plugins( op );
                                if ( rs->sr_err != LDAP_SUCCESS ) {
                                        /* plugin will have sent result */
                                        goto done;
@@ -369,7 +369,7 @@ do_add( Operation *op, SlapReply *rs )
        } else {
 #ifdef LDAP_SLAPI
                if ( op->o_pb ) {
-                       rs->sr_err = doPreAddPluginFNs( op );
+                       rs->sr_err = call_add_preop_plugins( op );
                        if ( rs->sr_err != LDAP_SUCCESS ) {
                                /* plugin will have sent result */
                                goto done;
@@ -387,7 +387,7 @@ do_add( Operation *op, SlapReply *rs )
        }
 
 #ifdef LDAP_SLAPI
-       if ( op->o_pb ) doPostAddPluginFNs( op );
+       if ( op->o_pb ) call_add_postop_plugins( op );
 #endif /* LDAP_SLAPI */
 
 done:
@@ -654,7 +654,7 @@ slap_entry2mods(
 }
 
 #ifdef LDAP_SLAPI
-static void initAddPlugin( Operation *op,
+static void init_add_pblock( Operation *op,
        struct berval *dn, Entry *e, int manageDSAit )
 {
        slapi_int_pblock_set_operation( op->o_pb, op );
@@ -663,11 +663,11 @@ static void initAddPlugin( Operation *op,
        slapi_pblock_set( op->o_pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
 }
 
-static int doPreAddPluginFNs( Operation *op )
+static int call_add_preop_plugins( Operation *op )
 {
        int rc;
 
-       rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_pb );
+       rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_pb );
        if ( rc < 0 ) {
                /*
                 * A preoperation plugin failure will abort the
@@ -695,11 +695,11 @@ static int doPreAddPluginFNs( Operation *op )
        return rc;
 }
 
-static void doPostAddPluginFNs( Operation *op )
+static void call_add_postop_plugins( Operation *op )
 {
        int rc;
 
-       rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb );
+       rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb );
        if ( rc < 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, INFO,