Make declarations private.

apache · Feb 11, 2025 · 8cbdfde · 8cbdfde
1 parent 7a4c049
commit 8cbdfde
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 65 deletions.
diff --git a/include/private/apr_ldap_internal.h b/include/private/apr_ldap_internal.h
@@ -124,66 +124,6 @@ extern "C" {
 #endif
 
 
-typedef struct apr_ldap_t {
-    apr_pool_t *pool;
-    LDAP *ld;
-    apr_socket_t *socket;
-    apr_skiplist *results;
-    apr_array_header_t *abandons;
-    apr_array_header_t *prepares;
-    LDAPControl **serverctrls;
-    LDAPControl **clientctrls;
-    apu_err_t err;
-    apr_status_t status;
-} apr_ldap_t;
-
-
-typedef struct apr_ldap_prepare_t {
-    apr_pool_t *pool;
-    apr_ldap_prepare_cb cb;
-    void *ctx;
-} apr_ldap_prepare_t;
-
-
-
-typedef struct apr_ldap_result_t {
-    apr_pool_t *pool;
-    apr_ldap_t *ld;
-    const char *mech;
-    const char *rmech;
-    LDAPMessage *message;
-    int msgid;
-    int msgtype;
-    union {
-        apr_ldap_bind_cb bind;
-        apr_ldap_compare_cb compare;
-        apr_ldap_search_result_cb search;
-        apr_ldap_add_cb add;
-        apr_ldap_modify_cb modify;
-        apr_ldap_rename_cb rename;
-        apr_ldap_delete_cb delete;
-        apr_ldap_extended_cb ext;
-    } cb;
-    union {
-        apr_ldap_search_entry_cb search;
-    } entry_cb;
-    void *ctx;
-    apr_size_t nentries;
-} apr_ldap_result_t;
-
-
-
-APU_DECLARE_LDAP(apr_status_t) apr_ldap_status(int rc, apr_status_t status);
-
-APU_DECLARE_LDAP(void) apr_ldap_result_add(apr_pool_t *pool,
-                                           apr_ldap_t *ldap,
-                                           apr_ldap_result_t *res,
-                                           int msgid)
-                                           __attribute__((nonnull(1,2,3)));
-
-
-
-
 #if APR_HAVE_MODULAR_DSO
 
 /* For LDAP internal builds, wrap our LDAP namespace */

diff --git a/ldap/apr_ldap.c b/ldap/apr_ldap.c
@@ -51,7 +51,54 @@
 #include <assert.h>
 
 
-APU_DECLARE_LDAP(apr_status_t) apr_ldap_status(int rc, apr_status_t status)
+typedef struct apr_ldap_t {
+    apr_pool_t *pool;
+    LDAP *ld;
+    apr_socket_t *socket;
+    apr_skiplist *results;
+    apr_array_header_t *abandons;
+    apr_array_header_t *prepares;
+    LDAPControl **serverctrls;
+    LDAPControl **clientctrls;
+    apu_err_t err;
+    apr_status_t status;
+} apr_ldap_t;
+
+
+typedef struct apr_ldap_prepare_t {
+    apr_pool_t *pool;
+    apr_ldap_prepare_cb cb;
+    void *ctx;
+} apr_ldap_prepare_t;
+
+
+typedef struct apr_ldap_result_t {
+    apr_pool_t *pool;
+    apr_ldap_t *ld;
+    const char *mech;
+    const char *rmech;
+    LDAPMessage *message;
+    int msgid;
+    int msgtype;
+    union {
+        apr_ldap_bind_cb bind;
+        apr_ldap_compare_cb compare;
+        apr_ldap_search_result_cb search;
+        apr_ldap_add_cb add;
+        apr_ldap_modify_cb modify;
+        apr_ldap_rename_cb rename;
+        apr_ldap_delete_cb delete;
+        apr_ldap_extended_cb ext;
+    } cb;
+    union {
+        apr_ldap_search_entry_cb search;
+    } entry_cb;
+    void *ctx;
+    apr_size_t nentries;
+} apr_ldap_result_t;
+
+
+static apr_status_t apr_ldap_status(int rc, apr_status_t status)
 {
 
     if (LDAP_SUCCESS == rc) {
@@ -1215,10 +1262,10 @@ static apr_status_t results_cleanup(void *dptr)
 }
 
 
-APU_DECLARE_LDAP(void) apr_ldap_result_add(apr_pool_t *pool,
-                                           apr_ldap_t *ldap,
-                                           apr_ldap_result_t *res,
-                                           int msgid)
+static void apr_ldap_result_add(apr_pool_t *pool,
+                                apr_ldap_t *ldap,
+                                apr_ldap_result_t *res,
+                                int msgid)
 {
     res->pool = pool;
     res->ld = ldap;