Remove ap_method_list_do and ap_method_list_vdo as previously mentioned dev@httpd.

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

diff --git a/CHANGES b/CHANGES
index e9ddbe875e162e49f9f0c1996a33f53ce3dadcf4..25bf81e233eade121e059de020e05ade4e96ee40 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.5
 
   [Remove entries to the current 2.0 section below, when backported]
   
+  *) Remove the never working ap_method_list_do and ap_method_list_vdo.
+     [Paul Querna]
+
   *) Added makefile and doc for building mod_ssl on the NetWare 
      platform. [Guenter Knauf, Brad Nicholes]
   

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 45e3d66c0560715a9e1bea1e591d660367b06730..405ff2415aa85295fcb72174c364b9fa0831512f 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -261,14 +261,7 @@ AP_DECLARE(void) ap_method_registry_init(apr_pool_t *p);
 AP_DECLARE(ap_method_list_t *) ap_make_method_list(apr_pool_t *p, int nelts);
 AP_DECLARE(void) ap_copy_method_list(ap_method_list_t *dest,
                                     ap_method_list_t *src);
-AP_DECLARE_NONSTD(void) ap_method_list_do(int (*comp) (void *urec, const char *mname,
-                                                      int mnum),
-                                         void *rec,
-                                         const ap_method_list_t *ml, ...);
-AP_DECLARE(void) ap_method_list_vdo(int (*comp) (void *urec, const char *mname,
-                                                int mnum),
-                                   void *rec, const ap_method_list_t *ml,
-                                   va_list vp);
+
 /**
  * Search for an HTTP method name in an ap_method_list_t structure, and
  * return true if found.

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 04970bb63e24f2ce649e91f2bc765a9bf080274b..9e2f18f2debb1787cb7ef51c07cb35dba29e4ee6 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1272,30 +1272,6 @@ AP_DECLARE(void) ap_copy_method_list(ap_method_list_t *dest,
     }
 }
 
-/*
- * Invoke a callback routine for each method in the specified list.
- */
-AP_DECLARE_NONSTD(void) ap_method_list_do(int (*comp) (void *urec,
-                                                       const char *mname,
-                                                       int mnum),
-                                          void *rec,
-                                          const ap_method_list_t *ml, ...)
-{
-    va_list vp;
-    va_start(vp, ml);
-    ap_method_list_vdo(comp, rec, ml, vp);
-    va_end(vp);
-}
-
-AP_DECLARE(void) ap_method_list_vdo(int (*comp) (void *mrec,
-                                                 const char *mname,
-                                                 int mnum),
-                                    void *rec, const ap_method_list_t *ml,
-                                    va_list vp)
-{
-
-}
-
 /*
  * Return true if the specified HTTP method is in the provided
  * method list.