From: dgaudet <dgaudet@unknown>
Date: Tue, 15 Aug 2000 12:44:28 +0000 (+0000)
Subject: finish cleaning up after a change i made over 3 years ago.
X-Git-Tag: APACHE_2_0_ALPHA_6~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ea4f1fff0bff785dc7c7e177ea4433214219ece;p=thirdparty%2Fapache%2Fhttpd.git

finish cleaning up after a change i made over 3 years ago.


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

diff --git a/include/httpd.h b/include/httpd.h
index b9347daeee8..475b7793eaa 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1299,9 +1299,6 @@ API_EXPORT(char *) ap_make_dirstr_prefix(char *d, const char *s, int n);
  */
 API_EXPORT(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s);
 
-/* deprecated.  The previous two routines are preferred. */
-API_EXPORT(char *) ap_make_dirstr(apr_pool_t *a, const char *s, int n);
-
 /**
  * Given a directory and filename, create a single path out of them.  This
  * function is smart enough to ensure that there is a sinlge '/' between the
diff --git a/server/util.c b/server/util.c
index 57bcd6a0f63..2273058283f 100644
--- a/server/util.c
+++ b/server/util.c
@@ -570,32 +570,6 @@ API_EXPORT(char *) ap_make_dirstr_parent(apr_pool_t *p, const char *s)
 }
 
 
-/*
- * This function is deprecated.  Use one of the preceeding two functions
- * which are faster.
- */
-API_EXPORT(char *) ap_make_dirstr(apr_pool_t *p, const char *s, int n)
-{
-    register int x, f;
-    char *res;
-
-    for (x = 0, f = 0; s[x]; x++) {
-	if (s[x] == '/')
-	    if ((++f) == n) {
-		res = apr_palloc(p, x + 2);
-		memcpy(res, s, x);
-		res[x] = '/';
-		res[x + 1] = '\0';
-		return res;
-	    }
-    }
-
-    if (s[strlen(s) - 1] == '/')
-	return apr_pstrdup(p, s);
-    else
-	return apr_pstrcat(p, s, "/", NULL);
-}
-
 API_EXPORT(int) ap_count_dirs(const char *path)
 {
     register int x, n;