You don't export registered entry points

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664217 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/session/mod_session_cookie.c b/modules/session/mod_session_cookie.c
index 8354537406baf9ea7bdf8f08fb833083ae1d65e0..6374c69791bb736e238b0f05faae6c1de816bc7e 100644 (file)
--- a/modules/session/mod_session_cookie.c
+++ b/modules/session/mod_session_cookie.c
@@ -39,9 +39,6 @@ typedef struct {
     int remove_set;
 } session_cookie_dir_conf;
 
-AP_DECLARE(int) ap_session_cookie_save(request_rec * r, session_rec * z);
-AP_DECLARE(int) ap_session_cookie_load(request_rec * r, session_rec ** z);
-
 /**
  * Set the cookie and embed the session within it.
  *
@@ -58,7 +55,7 @@ AP_DECLARE(int) ap_session_cookie_load(request_rec * r, session_rec ** z);
  * @param r The request pointer.
  * @param z A pointer to where the session will be written.
  */
-AP_DECLARE(int) ap_session_cookie_save(request_rec * r, session_rec * z)
+static int session_cookie_save(request_rec * r, session_rec * z)
 {
 
     session_cookie_dir_conf *conf = ap_get_module_config(r->per_dir_config,
@@ -107,7 +104,7 @@ AP_DECLARE(int) ap_session_cookie_save(request_rec * r, session_rec * z)
  *
  * On success, this returns APR_SUCCESS.
  */
-AP_DECLARE(int) ap_session_cookie_load(request_rec * r, session_rec ** z)
+static int session_cookie_load(request_rec * r, session_rec ** z)
 {
 
     session_cookie_dir_conf *conf = ap_get_module_config(r->per_dir_config,
@@ -262,8 +259,8 @@ static const command_rec session_cookie_cmds[] =
 
 static void register_hooks(apr_pool_t * p)
 {
-    ap_hook_session_load(ap_session_cookie_load, NULL, NULL, APR_HOOK_MIDDLE);
-    ap_hook_session_save(ap_session_cookie_save, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_session_load(session_cookie_load, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_session_save(session_cookie_save, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 module AP_MODULE_DECLARE_DATA session_cookie_module =

diff --git a/modules/session/mod_session_dbd.c b/modules/session/mod_session_dbd.c
index 87693b0072b7ea6f4d87507f81f423006adef0d7..37ad99d86903f8027746d2569c99e6f8432d3542 100644 (file)
--- a/modules/session/mod_session_dbd.c
+++ b/modules/session/mod_session_dbd.c
@@ -48,10 +48,6 @@ typedef struct {
     const char *deletelabel;
 } session_dbd_dir_conf;
 
-AP_DECLARE(int) ap_session_dbd_load(request_rec * r, session_rec ** z);
-AP_DECLARE(int) ap_session_dbd_save(request_rec * r, session_rec * z);
-AP_DECLARE(int) ap_session_dbd_monitor(apr_pool_t *p);
-
 /* optional function - look it up once in post_config */
 static ap_dbd_t *(*session_dbd_acquire_fn) (request_rec *) = NULL;
 static void (*session_dbd_prepare_fn) (server_rec *, const char *, const char *) = NULL;
@@ -166,7 +162,7 @@ static apr_status_t dbd_load(request_rec * r, const char *key, const char **val)
  *
  * On success, this returns OK.
  */
-AP_DECLARE(int) ap_session_dbd_load(request_rec * r, session_rec ** z)
+static int session_dbd_load(request_rec * r, session_rec ** z)
 {
 
     session_dbd_dir_conf *conf = ap_get_module_config(r->per_dir_config,
@@ -404,7 +400,7 @@ static apr_status_t dbd_clean(apr_pool_t *p)
  * @param r The request pointer.
  * @param z A pointer to where the session will be written.
  */
-AP_DECLARE(int) ap_session_dbd_save(request_rec * r, session_rec * z)
+static int session_dbd_save(request_rec * r, session_rec * z)
 {
 
     char *buffer;
@@ -475,7 +471,7 @@ AP_DECLARE(int) ap_session_dbd_save(request_rec * r, session_rec * z)
  * This function performs housekeeping on the database, deleting expired
  * sessions.
  */
-AP_DECLARE(int) ap_session_dbd_monitor(apr_pool_t *p)
+static int session_dbd_monitor(apr_pool_t *p)
 {
     /* TODO handle housekeeping */
     dbd_clean(p);
@@ -615,9 +611,9 @@ static const command_rec session_dbd_cmds[] =
 
 static void register_hooks(apr_pool_t * p)
 {
-    ap_hook_session_load(ap_session_dbd_load, NULL, NULL, APR_HOOK_MIDDLE);
-    ap_hook_session_save(ap_session_dbd_save, NULL, NULL, APR_HOOK_MIDDLE);
-    ap_hook_monitor(ap_session_dbd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_session_load(session_dbd_load, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_session_save(session_dbd_save, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_monitor(session_dbd_monitor, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
 module AP_MODULE_DECLARE_DATA session_dbd_module =