apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apr/test testfile.c
Date Sun, 17 Dec 2000 03:35:42 GMT
rbb         00/12/16 19:35:42

  Modified:    modules/dav/fs repos.c
               modules/generators mod_autoindex.c
               modules/mappers mod_negotiation.c mod_speling.c
               modules/test mod_autoindex.c
               server   config.c
               .        CHANGES STATUS
               file_io/os2 dir.c
               file_io/unix dir.c
               file_io/win32 dir.c
               include  apr_file_io.h
               test     testfile.c
  Log:
  Rename the apr_opendir symbol to apr_dir_open.  This makes more sense,
  and the rename was proposed a while ago inside of APR.
  
  Revision  Changes    Path
  1.39      +1 -1      httpd-2.0/modules/dav/fs/repos.c
  
  Index: repos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/fs/repos.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- repos.c	2000/11/27 12:54:07	1.38
  +++ repos.c	2000/12/17 03:35:37	1.39
  @@ -1352,7 +1352,7 @@
       fsctx->res2.collection = 0;
   
       /* open and scan the directory */
  -    if ((apr_opendir(&dirp, fsctx->path1.buf, pool)) != APR_SUCCESS) {
  +    if ((apr_dir_open(&dirp, fsctx->path1.buf, pool)) != APR_SUCCESS) {
   	/* ### need a better error */
   	return dav_new_error(pool, HTTP_NOT_FOUND, 0, NULL);
       }
  
  
  
  1.48      +1 -1      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- mod_autoindex.c	2000/11/22 19:38:06	1.47
  +++ mod_autoindex.c	2000/12/17 03:35:38	1.48
  @@ -1551,7 +1551,7 @@
       char keyid;
       char direction;
   
  -    if ((status = apr_opendir(&d, name, r->pool)) != APR_SUCCESS) {
  +    if ((status = apr_dir_open(&d, name, r->pool)) != APR_SUCCESS) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
   		    "Can't open directory for index: %s", r->filename);
   	return HTTP_FORBIDDEN;
  
  
  
  1.43      +1 -1      httpd-2.0/modules/mappers/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- mod_negotiation.c	2000/11/29 01:53:31	1.42
  +++ mod_negotiation.c	2000/12/17 03:35:38	1.43
  @@ -930,7 +930,7 @@
       ++filp;
       prefix_len = strlen(filp);
   
  -    if ((status = apr_opendir(&dirp, neg->dir_name, neg->pool)) != APR_SUCCESS)
{
  +    if ((status = apr_dir_open(&dirp, neg->dir_name, neg->pool)) != APR_SUCCESS)
{
           ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
                       "cannot read directory for multi: %s", neg->dir_name);
           return HTTP_FORBIDDEN;
  
  
  
  1.22      +1 -1      httpd-2.0/modules/mappers/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_speling.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_speling.c	2000/12/01 21:49:25	1.21
  +++ mod_speling.c	2000/12/17 03:35:38	1.22
  @@ -297,7 +297,7 @@
       url = apr_pstrndup(r->pool, r->uri, (urlen - pglen));
   
       /* Now open the directory and do ourselves a check... */
  -    if (apr_opendir(&dir, good, r->pool) != APR_SUCCESS) {
  +    if (apr_dir_open(&dir, good, r->pool) != APR_SUCCESS) {
           /* Oops, not a directory... */
           return DECLINED;
       }
  
  
  
  1.3       +1 -1      httpd-2.0/modules/test/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/test/mod_autoindex.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_autoindex.c	2000/11/23 13:03:46	1.2
  +++ mod_autoindex.c	2000/12/17 03:35:38	1.3
  @@ -1551,7 +1551,7 @@
       char keyid;
       char direction;
   
  -    if ((status = apr_opendir(&d, name, r->pool)) != APR_SUCCESS) {
  +    if ((status = apr_dir_open(&d, name, r->pool)) != APR_SUCCESS) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
   		    "Can't open directory for index: %s", r->filename);
   	return HTTP_FORBIDDEN;
  
  
  
  1.89      +1 -1      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- config.c	2000/12/15 19:20:10	1.88
  +++ config.c	2000/12/17 03:35:39	1.89
  @@ -1381,7 +1381,7 @@
   	 * for this.
   	 */
   	fprintf(stderr, "Processing config directory: %s\n", fname);
  -	if (apr_opendir(&dirp, fname, p) != APR_SUCCESS) {
  +	if (apr_dir_open(&dirp, fname, p) != APR_SUCCESS) {
   	    perror("fopen");
   	    fprintf(stderr, "%s: could not open config directory %s\n",
   		ap_server_argv0, fname);
  
  
  
  1.24      +1 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- CHANGES	2000/12/16 02:06:47	1.23
  +++ CHANGES	2000/12/17 03:35:39	1.24
  @@ -1,4 +1,5 @@
   Changes with APR b1
  +  *) Rename apr_opendir to apr_dir_open.  [Ryan Bloom]
   
     *) apr_snprintf()'s %pI format string now takes apr_sockaddr_t *
        instead of sockaddr_in *.  [Jeff Trawick]
  
  
  
  1.11      +1 -4      apr/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/apr/STATUS,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- STATUS	2000/12/17 03:08:44	1.10
  +++ STATUS	2000/12/17 03:35:39	1.11
  @@ -1,5 +1,5 @@
   APACHE PORTABLE RUNTIME (APR) LIBRARY STATUS:			-*-text-*-
  -Last modified at [$Date: 2000/12/17 03:08:44 $]
  +Last modified at [$Date: 2000/12/17 03:35:39 $]
   
   Release:
   
  @@ -17,9 +17,6 @@
       * Source code layout needs to be decided for apr and apr-util.  There
         has been some discussion about adding a src/ directory to apr or 
         removing it from apr-util/.  Either way, this needs to be decided.
  -
  -    * Rename Symbols:
  -		apr_opendir   -->    apr_dir_open
   
   RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
   
  
  
  
  1.20      +1 -1      apr/file_io/os2/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/dir.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- dir.c	2000/11/14 06:40:02	1.19
  +++ dir.c	2000/12/17 03:35:40	1.20
  @@ -69,7 +69,7 @@
   
   
   
  -apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cntxt)
  +apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *cntxt)
   {
       apr_dir_t *thedir = (apr_dir_t *)apr_palloc(cntxt, sizeof(apr_dir_t));
       
  
  
  
  1.41      +1 -1      apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/dir.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- dir.c	2000/11/14 06:40:03	1.40
  +++ dir.c	2000/12/17 03:35:40	1.41
  @@ -67,7 +67,7 @@
       }
   } 
   
  -apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
  +apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
   {
       /* On some platforms (e.g., Linux+GNU libc), d_name[] in struct 
        * dirent is declared with enough storage for the name.  On other
  
  
  
  1.40      +1 -1      apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/dir.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- dir.c	2000/11/11 04:18:16	1.39
  +++ dir.c	2000/12/17 03:35:40	1.40
  @@ -82,7 +82,7 @@
       return APR_SUCCESS;
   } 
   
  -apr_status_t apr_opendir(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
  +apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *cont)
   {
       /* Note that we won't open a directory that is greater than MAX_PATH,
        * including the trailing /* wildcard suffix.  If a * won't fit, then
  
  
  
  1.81      +1 -1      apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_io.h,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- apr_file_io.h	2000/12/07 15:55:01	1.80
  +++ apr_file_io.h	2000/12/17 03:35:41	1.81
  @@ -643,7 +643,7 @@
    * @param dirname The full path to the directory (use / on all systems)
    * @param cont The pool to use.
    */                        
  -apr_status_t apr_opendir(apr_dir_t **new_dir, const char *dirname, apr_pool_t *cont);
  +apr_status_t apr_dir_open(apr_dir_t **new_dir, const char *dirname, apr_pool_t *cont);
   
   /**
    * close the specified directory. 
  
  
  
  1.21      +1 -1      apr/test/testfile.c
  
  Index: testfile.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testfile.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- testfile.c	2000/12/10 21:44:39	1.20
  +++ testfile.c	2000/12/17 03:35:41	1.21
  @@ -302,7 +302,7 @@
   	apr_close(file);
   
       fprintf(stdout, "\tOpening Directory.......");
  -    if (apr_opendir(&temp, "testdir", context) != APR_SUCCESS) {
  +    if (apr_dir_open(&temp, "testdir", context) != APR_SUCCESS) {
           fprintf(stderr, "Could not open directory\n");
           return -1;
       }
  
  
  

Mime
View raw message