httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@locus.apache.org
Subject cvs commit: apache-2.0/src/main util.c
Date Tue, 15 Aug 2000 12:44:30 GMT
dgaudet     00/08/15 05:44:29

  Modified:    src/include httpd.h
               src/main util.c
  Log:
  finish cleaning up after a change i made over 3 years ago.
  
  Revision  Changes    Path
  1.78      +0 -3      apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- httpd.h	2000/08/14 02:47:29	1.77
  +++ httpd.h	2000/08/15 12:44:24	1.78
  @@ -1299,9 +1299,6 @@
    */
   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
  
  
  
  1.68      +0 -26     apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- util.c	2000/08/07 20:11:36	1.67
  +++ util.c	2000/08/15 12:44:28	1.68
  @@ -570,32 +570,6 @@
   }
   
   
  -/*
  - * 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;
  
  
  

Mime
View raw message