more structure name cleanup

diff --git a/include/slapi-plugin.h b/include/slapi-plugin.h
index b3589058f2b6a441e4ab567ad74f8b279e38aa6d..3076bc9c22ba9f1fa85410776bf574cba8435dcc 100644 (file)
--- a/include/slapi-plugin.h
+++ b/include/slapi-plugin.h
@@ -31,9 +31,9 @@ typedef struct slapi_attr             Slapi_Attr;
 typedef struct slapi_value             Slapi_Value;
 typedef struct slapi_valueset          Slapi_ValueSet;
 typedef struct slapi_filter            Slapi_Filter;
-typedef struct slap_backend_db         Slapi_Backend;
-typedef struct slap_op                 Slapi_Operation;
-typedef struct slap_conn               Slapi_Connection;
+typedef struct BackendDB               Slapi_Backend;
+typedef struct Operation               Slapi_Operation;
+typedef struct Connection              Slapi_Connection;
 typedef struct slapi_dn                        Slapi_DN;
 typedef struct slapi_rdn               Slapi_RDN;
 typedef struct slapi_mod               Slapi_Mod;

diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h
index f4b562b6e7932512c8f3ef18428b836781af03bf..e4d198592d6b2aa87f4ad35dbdc356678bc0ffd5 100644 (file)
--- a/servers/slapd/slapi/slapi.h
+++ b/servers/slapd/slapi/slapi.h
@@ -30,11 +30,11 @@ LDAP_BEGIN_DECL
 /*
  * Quick 'n' dirty to make struct slapi_* in slapi-plugin.h opaque
  */
-#define slapi_entry    slap_entry
-#define slapi_attr     slap_attr
+#define slapi_entry    Entry
+#define slapi_attr     Attribute
 #define slapi_value    berval
 #define slapi_valueset berval *
-#define slapi_filter   slap_filter
+#define slapi_filter   Filter
 
 LDAP_END_DECL