You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/03/14 17:36:15 UTC
cvs commit: apache-2.0/src/lib/apr/include apr_file_io.h apr_portable.h
rbb 00/03/14 08:36:15
Modified: src/lib/apr/file_io/unix dir.c fileacc.c filedup.c
filestat.c open.c pipe.c readwrite.c seek.c
src/lib/apr/include apr_file_io.h apr_portable.h
Log:
Fix the docs for all of the file I/O functions. Also added variable names to
the prototypes for all of the file I/O functions.
Revision Changes Path
1.20 +34 -31 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dir.c 2000/03/10 00:05:58 1.19
+++ dir.c 2000/03/14 16:36:12 1.20
@@ -68,11 +68,11 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_opendir(ap_dir_t **, char *, ap_context_t *)
+ * ap_status_t ap_opendir(ap_dir_t **new, char *dirname, ap_context_t *cont)
* Open the specified directory.
- * arg 1) The context to use.
+ * arg 1) The opened directory descriptor.
* arg 2) The full path to the directory (use / on all systems)
- * arg 3) The opened directory descriptor.
+ * arg 3) The context to use.
*/
ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t *cont)
{
@@ -94,7 +94,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_closedir(ap_dir_t *)
+ * ap_status_t ap_closedir(ap_dir_t *thedir)
* close the specified directory.
* arg 1) the directory descriptor to close.
*/
@@ -110,7 +110,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_readdir(ap_dir_t *)
+ * ap_status_t ap_readdir(ap_dir_t *thedir)
* Read the next entry from the specified directory.
* arg 1) the directory descriptor to read from, and fill out.
* NOTE: All systems return . and .. as the first two files.
@@ -140,7 +140,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_rewinddir(ap_dir_t *)
+ * ap_status_t ap_rewinddir(ap_dir_t *thedir)
* Rewind the directory to the first entry.
* arg 1) the directory descriptor to rewind.
*/
@@ -151,11 +151,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_make_dir(const char *, ap_fileperms_t, ap_context_t *)
+ * ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm,
+ * ap_context_t *cont)
* Create a new directory on the file system.
- * arg 1) the context to use.
- * arg 2) the path for the directory to be created. (use / on all systems)
- * arg 3) Permissions for the new direcoty.
+ * arg 1) the path for the directory to be created. (use / on all systems)
+ * arg 2) Permissions for the new direcoty.
+ * arg 3) the context to use.
*/
ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
{
@@ -169,10 +170,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_remove_dir(const char *, ap_context_t *)
+ * ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
* Remove directory from the file system.
- * arg 1) the context to use.
- * arg 2) the path for the directory to be removed. (use / on all systems)
+ * arg 1) the path for the directory to be removed. (use / on all systems)
+ * arg 2) the context to use.
*/
ap_status_t ap_remove_dir(const char *path, ap_context_t *cont)
{
@@ -185,10 +186,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_dir_entry_size(ap_ssize_t *, ap_dir_t *)
+ * ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir)
* Get the size of the current directory entry.
- * arg 1) the currently open directory.
- * arg 2) the size of the directory entry.
+ * arg 1) the size of the directory entry.
+ * arg 2) the currently open directory.
*/
ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
{
@@ -211,10 +212,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_dir_entry_mtime(time_t *, ap_dir_t *)
+ * ap_status_t ap_dir_entry_mtime(time_t *mtime, ap_dir_t *thedir)
* Get the last modified time of the current directory entry.
- * arg 1) the currently open directory.
- * arg 2) the last modified time of the directory entry.
+ * arg 1) the last modified time of the directory entry.
+ * arg 2) the currently open directory.
*/
ap_status_t ap_dir_entry_mtime(time_t *mtime, struct dir_t *thedir)
{
@@ -238,10 +239,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_dir_entry_ftype(ap_filetype_e *, ap_dir_t *)
+ * ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir)
* Get the file type of the current directory entry.
- * arg 1) the currently open directory.
- * arg 2) the file type of the directory entry.
+ * arg 1) the file type of the directory entry.
+ * arg 2) the currently open directory.
*/
ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct dir_t *thedir)
{
@@ -280,10 +281,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_dir_filename(char **, ap_dir_t *)
+ * ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir)
* Get the file name of the current directory entry.
- * arg 1) the currently open directory.
- * arg 2) the file name of the directory entry.
+ * arg 1) the file name of the directory entry.
+ * arg 2) the currently open directory.
*/
ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
{
@@ -297,10 +298,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_os_dir(ap_os_dir_t **, ap_dir_t *)
+ * ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir)
* convert the dir from apr type to os specific type.
- * arg 1) The apr dir to convert.
- * arg 2) The os specific dir we are converting to
+ * arg 1) The os specific dir we are converting to
+ * arg 2) The apr dir to convert.
*/
ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct dir_t *dir)
{
@@ -312,10 +313,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_put_os_dir(ap_dir_t *, ap_os_dir_t *)
+ * ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir,
+ * ap_context_t *cont)
* convert the dir from os specific type to apr type.
- * arg 1) The os specific dir to convert
- * arg 2) The apr dir we are converting to.
+ * arg 1) The apr dir we are converting to.
+ * arg 2) The os specific dir to convert
+ * arg 3) The context to use when creating to apr directory.
*/
ap_status_t ap_put_os_dir(struct dir_t **dir, ap_os_dir_t *thedir,
ap_context_t *cont)
1.16 +7 -7 apache-2.0/src/lib/apr/file_io/unix/fileacc.c
Index: fileacc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fileacc.c 2000/03/10 00:05:58 1.15
+++ fileacc.c 2000/03/14 16:36:12 1.16
@@ -58,10 +58,10 @@
/* A file to put ALL of the accessor functions for struct file_t types. */
/* ***APRDOC********************************************************
- * ap_status_t ap_get_filename(char **, ap_file_t *)
+ * ap_status_t ap_get_filename(char **new, ap_file_t *thefile)
* return the file name of the current file.
- * arg 1) The currently open file.
- * arg 2) The path of the file.
+ * arg 1) The path of the file.
+ * arg 2) The currently open file.
*/
ap_status_t ap_get_filename(char **new, struct file_t *thefile)
{
@@ -104,11 +104,11 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_filedata(void **, char *key, ap_file_t *)
+ * ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file)
* Return the data associated with the current file.
- * arg 1) The currently open file.
+ * arg 1) The user data associated with the file.
* arg 2) The key to use for retreiving data associated with this file.
- * arg 3) The user data associated with the file.
+ * arg 3) The currently open file.
*/
ap_status_t ap_get_filedata(void **data, char *key, struct file_t *file)
{
@@ -122,7 +122,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_set_filedata(ap_file_t *, void *, char *key,
+ * ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key,
ap_status (*cleanup) (void *))
* Set the data associated with the current file.
* arg 1) The currently open file.
1.10 +3 -3 apache-2.0/src/lib/apr/file_io/unix/filedup.c
Index: filedup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- filedup.c 2000/03/10 00:05:58 1.9
+++ filedup.c 2000/03/14 16:36:12 1.10
@@ -56,10 +56,10 @@
#include "fileio.h"
/* ***APRDOC********************************************************
- * ap_status_t ap_dupfile(ap_file_t **, ap_file_t *)
+ * ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file)
* duplicate the specified file descriptor.
- * arg 1) The file to duplicate.
- * arg 2) The structure to duplicate into.
+ * arg 1) The structure to duplicate into.
+ * arg 2) The file to duplicate.
*/
ap_status_t ap_dupfile(struct file_t **new_file, struct file_t *old_file)
{
1.15 +2 -2 apache-2.0/src/lib/apr/file_io/unix/filestat.c
Index: filestat.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filestat.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- filestat.c 2000/03/10 00:05:59 1.14
+++ filestat.c 2000/03/14 16:36:12 1.15
@@ -82,7 +82,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_getfileinfo(ap_file_t *)
+ * ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile)
* get the specified file's stats..
* arg 1) Where to store the information about the file.
* arg 2) The file to get information about.
@@ -111,7 +111,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_stat(ap_file_t **, char *, ap_context_t *)
+ * ap_status_t ap_stat(ap_file_t **finfo, char *fname, ap_context_t *cont)
* get the specified file's stats. The file is specified by filename,
* instead of using a pre-opened file.
* arg 1) Where to store the information about the file.
1.33 +19 -18 apache-2.0/src/lib/apr/file_io/unix/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- open.c 2000/03/10 00:05:59 1.32
+++ open.c 2000/03/14 16:36:12 1.33
@@ -79,10 +79,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_open(ap_context_t *, char *, ap_int32,
- * ap_fileperms, ap_file_t **)
+ * ap_status_t ap_open(ap_file_t **new, char *fname, ap_int32 flag,
+ * ap_fileperms perm, ap_context_t *cont)
* Open the specified file.
- * arg 1) The context to use.
+ * arg 1) The opened file descriptor.
* arg 2) The full path to the file (using / on all systems)
* arg 3) Or'ed value of:
* APR_READ open for reading
@@ -95,7 +95,7 @@
* APR_EXCL return error if APR_CREATE and file exists
* APR_DELONCLOSE delete the file after closing.
* arg 4) Access permissions for file.
- * arg 5) The opened file descriptor.
+ * arg 5) The context to use.
* NOTE: If mode is APR_OS_DEFAULT, the system open command will be
* called without any mode parameters.
*/
@@ -185,7 +185,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_close(ap_file_t *)
+ * ap_status_t ap_close(ap_file_t *file)
* Close the specified file.
* arg 1) The file descriptor to close.
*/
@@ -201,10 +201,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_remove_file(ap_context_t *, char *)
+ * ap_status_t ap_remove_file(char *path, ap_context_t *cont)
* delete the specified file.
- * arg 1) The context to use.
- * arg 2) The full path to the file (using / on all systems)
+ * arg 1) The full path to the file (using / on all systems)
+ * arg 2) The context to use.
* NOTE: If the file is open, it won't be removed until all instances are
* closed.
*/
@@ -219,10 +219,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_os_file(ap_file_t *, ap_os_file_t *)
+ * ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file)
* convert the file from apr type to os specific type.
- * arg 1) The apr file to convert.
- * arg 2) The os specific file we are converting to
+ * arg 1) The os specific file we are converting to
+ * arg 2) The apr file to convert.
* NOTE: On Unix, it is only possible to get a file descriptor from
* an apr file type.
*/
@@ -242,11 +242,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_put_os_file(ap_context_t *, ap_file_t *, ap_os_file_t *)
+ * ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile,
+ * ap_context_t *cont)
* convert the file from os specific type to apr type.
- * arg 1) The context to use if it is needed.
- * arg 2) The apr file we are converting to.
- * arg 3) The os specific file to convert
+ * arg 1) The apr file we are converting to.
+ * arg 2) The os specific file to convert
+ * arg 3) The context to use if it is needed.
* NOTE: On Unix, it is only possible to put a file descriptor into
* an apr file type.
*/
@@ -270,7 +271,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_eof(ap_file_t *)
+ * ap_status_t ap_eof(ap_file_t *fptr)
* Are we at the end of the file
* arg 1) The apr file we are testing.
* NOTE: Returns APR_EOF if we are at the end of file, APR_SUCCESS otherwise.
@@ -290,7 +291,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_ferror(ap_file_t *)
+ * ap_status_t ap_ferror(ap_file_t *fptr)
* Is there an error on the stream?
* arg 1) The apr file we are testing.
* NOTE: Returns -1 if the error indicator is set, APR_SUCCESS otherwise.
@@ -305,7 +306,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_open_stderr(ap_file_t **, ap_context_t *)
+ * ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont)
* open standard error as an apr file pointer.
* arg 1) The apr file to use as stderr.
* arg 2) The context to allocate the file out of.
1.15 +16 -10 apache-2.0/src/lib/apr/file_io/unix/pipe.c
Index: pipe.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pipe.c 2000/03/14 00:46:32 1.14
+++ pipe.c 2000/03/14 16:36:12 1.15
@@ -79,7 +79,7 @@
/* ***APRDOC********************************************************
- * ap_status_t ap_set_pipe_timeout(ap_file_t *, ap_int32_t)
+ * ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_int32_t timeout)
* Set the timeout value for a pipe.
* arg 1) The pipe we are setting a timeout on.
* arg 3) The timeout value in seconds. Values < 0 mean wait forever, 0
@@ -95,11 +95,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_create_pipe(ap_file_t **, ap_context_t *, ap_file_t **)
+ * ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out,
+ * ap_context_t *cont)
* Create an anonymous pipe.
- * arg 1) The context to operate on.
- * arg 2) The file descriptor to use as input to the pipe.
- * arg 3) The file descriptor to use as output from the pipe.
+ * arg 1) The file descriptor to use as input to the pipe.
+ * arg 2) The file descriptor to use as output from the pipe.
+ * arg 3) The context to operate on.
*/
ap_status_t ap_create_pipe(struct file_t **in, struct file_t **out, ap_context_t *cont)
{
@@ -132,8 +133,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_create_namedpipe(ap_context_t *, char *, ap_fileperms_t,
- * char **)
+ * ap_status_t ap_create_namedpipe(char *filename, ap_fileperms_t perm,
+ * ap_context_t *cont)
* Create a named pipe.
* arg 1) The filename of the named pipe
* arg 2) The permissions for the newly created pipe.
@@ -150,12 +151,17 @@
return APR_SUCCESS;
}
-ap_status_t ap_block_pipe(ap_file_t *thefile)
+/* ***APRDOC********************************************************
+ * ap_status_t ap_block_pipe(ap_file_t *thepipe)
+ * Set a pipe to use blocking I/O.
+ * arg 1) The pipe to operate on.
+ */
+ap_status_t ap_block_pipe(ap_file_t *thepipe)
{
#ifndef BEOS /* this code won't work on BeOS */
int fd_flags;
- fd_flags = fcntl(thefile->filedes, F_GETFL, 0);
+ fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
#if defined(O_NONBLOCK)
fd_flags &= ~O_NONBLOCK;
#elif defined(~O_NDELAY)
@@ -166,7 +172,7 @@
/* XXXX: this breaks things, but an alternative isn't obvious...*/
return -1;
#endif
- if (fcntl(thefile->filedes, F_SETFL, fd_flags) == -1) {
+ if (fcntl(thepipe->filedes, F_SETFL, fd_flags) == -1) {
return errno;
}
#endif /* !BeOS */
1.26 +21 -20 apache-2.0/src/lib/apr/file_io/unix/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- readwrite.c 2000/03/10 00:05:59 1.25
+++ readwrite.c 2000/03/14 16:36:12 1.26
@@ -56,7 +56,7 @@
#include "fileio.h"
/* ***APRDOC********************************************************
- * ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *)
+ * ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
* Read data from the specified file.
* arg 1) The file descriptor to read from.
* arg 2) The buffer to store the data to.
@@ -135,7 +135,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_write(ap_file_t *, void *, ap_ssize_t *)
+ * ap_status_t ap_write(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes)
* Write data to the specified file.
* arg 1) The file descriptor to write to.
* arg 2) The buffer which contains the data.
@@ -207,7 +207,8 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_writev(ap_file_t *, struct iovec *, ap_size_t, ap_ssize_t *)
+ * ap_status_t ap_writev(ap_file_t *thefile, struct iovec *vec, ap_size_t nvec,
+ * ap_ssize_t *nbytes)
* Write data from iovec array to the specified file.
* arg 1) The file descriptor to write to.
* arg 2) The array from which to get the data to write to the file.
@@ -233,10 +234,10 @@
#endif
/* ***APRDOC********************************************************
- * ap_status_t ap_putc(char, ap_file_t *)
+ * ap_status_t ap_putc(char ch, ap_file_t *thefile)
* put a character into the specified file.
- * arg 1) The file descriptor to write to
- * arg 2) The character to write.
+ * arg 1) The character to write.
+ * arg 2) The file descriptor to write to
*/
ap_status_t ap_putc(char ch, ap_file_t *thefile)
{
@@ -253,10 +254,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_ungetc(char, ap_file_t *)
+ * ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
* put a character back onto a specified stream.
- * arg 1) The file descriptor to write to
- * arg 2) The character to write.
+ * arg 1) The character to write.
+ * arg 2) The file descriptor to write to
*/
ap_status_t ap_ungetc(char ch, ap_file_t *thefile)
{
@@ -271,10 +272,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_getc(char *, ap_file_t *)
+ * ap_status_t ap_getc(char *ch, ap_file_t *thefil)
* get a character from the specified file.
- * arg 1) The file descriptor to write to
- * arg 2) The character to write.
+ * arg 1) The character to write.
+ * arg 2) The file descriptor to write to
*/
ap_status_t ap_getc(char *ch, ap_file_t *thefile)
{
@@ -306,10 +307,10 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_puts(char *, ap_file_t *)
+ * ap_status_t ap_puts(char *str, ap_file_t *thefile)
* Put the string into a specified file.
- * arg 1) The file descriptor to write to from
- * arg 2) The string to write.
+ * arg 1) The string to write.
+ * arg 2) The file descriptor to write to from
*/
ap_status_t ap_puts(char *str, ap_file_t *thefile)
{
@@ -331,7 +332,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_flush(ap_file_t *)
+ * ap_status_t ap_flush(ap_file_t *thefile)
* Flush the file's buffer.
* arg 1) The file descriptor to flush
*/
@@ -350,11 +351,11 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_fgets(char *, int, ap_file_t *)
+ * ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
* Get a string from a specified file.
- * arg 1) The file descriptor to read from
- * arg 2) The buffer to store the string in.
- * arg 3) The length of the string
+ * arg 1) The buffer to store the string in.
+ * arg 2) The length of the string
+ * arg 3) The file descriptor to read from
*/
ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile)
{
1.5 +2 -1 apache-2.0/src/lib/apr/file_io/unix/seek.c
Index: seek.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/seek.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- seek.c 2000/03/10 00:05:59 1.4
+++ seek.c 2000/03/14 16:36:13 1.5
@@ -56,7 +56,8 @@
#include "fileio.h"
/* ***APRDOC********************************************************
- * ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *)
+ * ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where,
+ * ap_off_t *offset)
* Move the read/write file offset to a specified byte within a file.
* arg 1) The file descriptor
* arg 2) How to move the pointer, one of:
1.34 +36 -32 apache-2.0/src/lib/apr/include/apr_file_io.h
Index: apr_file_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- apr_file_io.h 2000/03/14 07:55:59 1.33
+++ apr_file_io.h 2000/03/14 16:36:14 1.34
@@ -126,52 +126,56 @@
};
/* Function definitions */
-ap_status_t ap_open(ap_file_t **, const char *, ap_int32_t, ap_fileperms_t, ap_context_t *);
-ap_status_t ap_close(ap_file_t *);
-ap_status_t ap_remove_file(char *, ap_context_t *);
-ap_status_t ap_eof(ap_file_t *);
-ap_status_t ap_ferror(ap_file_t *);
+ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag,
+ ap_fileperms_t perm, ap_context_t *cont);
+ap_status_t ap_close(ap_file_t *file);
+ap_status_t ap_remove_file(char *path, ap_context_t *cont);
+ap_status_t ap_eof(ap_file_t *fptr);
+ap_status_t ap_ferror(ap_file_t *fptr);
ap_status_t ap_open_stderr(ap_file_t **thefile, ap_context_t *cont);
-ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *);
-ap_status_t ap_write(ap_file_t *, void *, ap_ssize_t *);
-ap_status_t ap_writev(ap_file_t *, const struct iovec *vec, ap_size_t nvec, ap_ssize_t *nbytes);
-ap_status_t ap_putc(char, ap_file_t *);
-ap_status_t ap_getc(char *, ap_file_t *);
-ap_status_t ap_ungetc(char, ap_file_t *);
-ap_status_t ap_fgets(char *, int, ap_file_t *);
-ap_status_t ap_puts(char *, ap_file_t *);
-ap_status_t ap_flush(ap_file_t *);
+ap_status_t ap_read(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes);
+ap_status_t ap_write(ap_file_t *thefile, void *buf, ap_ssize_t *nbytes);
+ap_status_t ap_writev(ap_file_t *thefile, const struct iovec *vec,
+ ap_size_t nvec, ap_ssize_t *nbytes);
+ap_status_t ap_putc(char ch, ap_file_t *thefile);
+ap_status_t ap_getc(char *ch, ap_file_t *thefile);
+ap_status_t ap_ungetc(char ch, ap_file_t *thefile);
+ap_status_t ap_fgets(char *str, int len, ap_file_t *thefile);
+ap_status_t ap_puts(char *str, ap_file_t *thefile);
+ap_status_t ap_flush(ap_file_t *thefile);
API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
__attribute__((format(printf,2,3)));
-ap_status_t ap_dupfile(ap_file_t **, ap_file_t *);
+ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file);
ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile);
ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_context_t *cont);
-ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *);
+ap_status_t ap_seek(ap_file_t *thefile, ap_seek_where_t where,ap_off_t *offset);
-ap_status_t ap_opendir(ap_dir_t **, const char *, ap_context_t *);
-ap_status_t ap_closedir(ap_dir_t *);
-ap_status_t ap_readdir(ap_dir_t *);
-ap_status_t ap_rewinddir(ap_dir_t *);
-ap_status_t ap_make_dir(const char *, ap_fileperms_t, ap_context_t *);
-ap_status_t ap_remove_dir(const char *, ap_context_t *);
-
-ap_status_t ap_create_pipe(ap_file_t **, ap_file_t **, ap_context_t *);
-ap_status_t ap_create_namedpipe(char *, ap_fileperms_t, ap_context_t *);
+ap_status_t ap_opendir(ap_dir_t **new, const char *dirname, ap_context_t *cont);
+ap_status_t ap_closedir(ap_dir_t *thedir);
+ap_status_t ap_readdir(ap_dir_t *thedir);
+ap_status_t ap_rewinddir(ap_dir_t *thedir);
+ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm,
+ ap_context_t *cont);
+ap_status_t ap_remove_dir(const char *path, ap_context_t *cont);
+
+ap_status_t ap_create_pipe(ap_file_t **in, ap_file_t **out, ap_context_t *cont);
+ap_status_t ap_create_namedpipe(char *filename, ap_fileperms_t perm,
+ ap_context_t *cont);
ap_status_t ap_set_pipe_timeout(ap_file_t *thepipe, ap_int32_t timeout);
ap_status_t ap_block_pipe(ap_file_t *thepipe);
/*accessor and general file_io functions. */
-ap_status_t ap_get_filename(char **, ap_file_t *);
-ap_status_t ap_get_dir_filename(char **, ap_dir_t *);
-ap_status_t ap_get_filedata(void **, char *, ap_file_t *);
-ap_status_t ap_set_filedata(ap_file_t *, void *, char *,
+ap_status_t ap_get_filename(char **new, ap_file_t *thefile);
+ap_status_t ap_get_dir_filename(char **new, ap_dir_t *thedir);
+ap_status_t ap_get_filedata(void **data, char *key, ap_file_t *file);
+ap_status_t ap_set_filedata(ap_file_t *file, void *data, char *key,
ap_status_t (*cleanup) (void *));
-ap_status_t ap_dir_entry_size(ap_ssize_t *, ap_dir_t *);
-ap_status_t ap_dir_entry_mtime(time_t *, ap_dir_t *);
-ap_status_t ap_dir_entry_ftype(ap_filetype_e *, ap_dir_t *);
+ap_status_t ap_dir_entry_size(ap_ssize_t *size, ap_dir_t *thedir);
+ap_status_t ap_dir_entry_mtime(time_t *mtime, ap_dir_t *thedir);
+ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, ap_dir_t *thedir);
#ifdef __cplusplus
}
1.23 +6 -4 apache-2.0/src/lib/apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apr_portable.h 2000/03/10 00:06:09 1.22
+++ apr_portable.h 2000/03/14 16:36:14 1.23
@@ -179,8 +179,8 @@
typedef struct tm ap_os_exp_time_t;
#endif
-ap_status_t ap_get_os_file(ap_os_file_t *, ap_file_t *);
-ap_status_t ap_get_os_dir(ap_os_dir_t **, ap_dir_t *);
+ap_status_t ap_get_os_file(ap_os_file_t *thefile, ap_file_t *file);
+ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, ap_dir_t *dir);
ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *);
ap_status_t ap_get_os_lock(ap_os_lock_t *, ap_lock_t *);
ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *);
@@ -191,8 +191,10 @@
ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *, ap_key_t *);
#endif
-ap_status_t ap_put_os_file(ap_file_t **, ap_os_file_t *, ap_context_t *);
-ap_status_t ap_put_os_dir(ap_dir_t **, ap_os_dir_t *, ap_context_t *);
+ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile,
+ ap_context_t *cont);
+ap_status_t ap_put_os_dir(ap_dir_t **dir, ap_os_dir_t *thedir,
+ ap_context_t *cont);
ap_status_t ap_put_os_sock(ap_socket_t **, ap_os_sock_t *, ap_context_t *);
ap_status_t ap_put_os_lock(ap_lock_t **, ap_os_lock_t *, ap_context_t *);
ap_status_t ap_put_os_proc(ap_proc_t **, ap_os_proc_t *, ap_context_t *);