rbb 01/01/05 10:45:27
Modified: file_io/unix fileacc.c
include apr_file_io.h
Log:
There is no reason to duplicate the string, because we have already
pstrdup'ed it when we created the file variable.
Revision Changes Path
1.44 +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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- fileacc.c 2001/01/05 00:15:47 1.43
+++ fileacc.c 2001/01/05 18:45:25 1.44
@@ -57,7 +57,7 @@
/* A file to put ALL of the accessor functions for apr_file_t types. */
-apr_status_t apr_get_filename(char **fname, apr_file_t *thefile)
+apr_status_t apr_get_filename(const 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 = apr_pstrdup(thefile->cntxt, thefile->n.fname);
+ *fname = thefile->n.fname;
#else /* !def Win32 */
- *fname = apr_pstrdup(thefile->cntxt, thefile->fname);
+ *fname = thefile->fname;
#endif
return APR_SUCCESS;
}
1.84 +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.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- apr_file_io.h 2001/01/05 00:15:47 1.83
+++ apr_file_io.h 2001/01/05 18:45:26 1.84
@@ -738,7 +738,7 @@
* @param new_path The path of the file.
* @param thefile The currently open file.
*/
-apr_status_t apr_get_filename(char **new_path, apr_file_t *thefile);
+apr_status_t apr_get_filename(const char **new_path, apr_file_t *thefile);
/**
* Get the file name of the current directory entry.