You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rb...@apache.org on 2001/01/05 01:15:48 UTC

cvs commit: apr/include apr_file_io.h

rbb         01/01/04 16:15:48

  Modified:    file_io/unix fileacc.c
               include  apr_file_io.h
  Log:
  Back out some changes to the file_io stuff that wasn't ready yet.
  
  Revision  Changes    Path
  1.43      +3 -3      apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- fileacc.c	2001/01/05 00:10:10	1.42
  +++ fileacc.c	2001/01/05 00:15:47	1.43
  @@ -57,7 +57,7 @@
   
   /* A file to put ALL of the accessor functions for apr_file_t types. */
   
  -apr_status_t apr_get_filename(const char **fname, apr_file_t *thefile)
  +apr_status_t apr_get_filename(char **fname, apr_file_t *thefile)
   {
   #ifdef WIN32 /* this test is only good until some other platform trys wchar* */
   #if APR_HAS_UNICODE_FS
  @@ -70,10 +70,10 @@
       }
       else
   #endif /* !APR_HAS_UNICODE_FS */
  -        *fname = thefile->n.fname;
  +        *fname = apr_pstrdup(thefile->cntxt, thefile->n.fname);
   
   #else /* !def Win32 */
  -    *fname = thefile->fname;
  +    *fname = apr_pstrdup(thefile->cntxt, thefile->fname);
   #endif 
       return APR_SUCCESS;
   }
  
  
  
  1.83      +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.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- apr_file_io.h	2001/01/05 00:10:10	1.82
  +++ apr_file_io.h	2001/01/05 00:15:47	1.83
  @@ -738,7 +738,7 @@
    * @param new_path The path of the file.  
    * @param thefile The currently open file.
    */                     
  -apr_status_t apr_get_filename(const char **new_path, apr_file_t *thefile);
  +apr_status_t apr_get_filename(char **new_path, apr_file_t *thefile);
   
   /**
    * Get the file name of the current directory entry.