rbb 99/02/23 13:23:46
Modified: include apr_errno.h apr_file_io.h apr_general.h Log: The rest of the changes to make apr names conform to the style we have selected. Also abstracts out the rest of the types for apr_open and apr_close. Revision Changes Path 1.5 +1 -1 apache-apr/include/apr_errno.h Index: apr_errno.h =================================================================== RCS file: /home/cvs/apache-apr/include/apr_errno.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apr_errno.h 1999/02/23 15:28:31 1.4 +++ apr_errno.h 1999/02/23 21:23:45 1.5 @@ -61,7 +61,7 @@ /* If this definition of APRStatus changes, then we can remove this, but right now, the decision was to use an errno-like implementation. */ -#define APRStatus int +typedef int apr_status_t; #define APR_SUCCESS 1 #define APR_FAILURE -1 1.4 +7 -4 apache-apr/include/apr_file_io.h Index: apr_file_io.h =================================================================== RCS file: /home/cvs/apache-apr/include/apr_file_io.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apr_file_io.h 1999/02/23 15:28:32 1.3 +++ apr_file_io.h 1999/02/23 21:23:45 1.4 @@ -75,7 +75,7 @@ exists. */ #define APR_NONBLOCK 256 /* Don't block when reading or writing */ -typedef struct APRFile { +typedef struct apr_file_t { int filedes; char * fname; int buffered; @@ -86,9 +86,12 @@ time_t atime; time_t mtime; time_t ctime; -} APRFile; +} apr_file_t; +typedef mode_t apr_fileperms_t; + /* Function definitions */ -APRFile *apr_open(char *fname, int flag, mode_t mode); -APRStatus apr_close(APRFile file); +apr_file_t *apr_open(char *fname, apr_int32_t flag, apr_fileperms_t mode); +apr_status_t apr_close(apr_file_t file); #endif /* ! APR_FILE_IO_H */ + 1.3 +2 -0 apache-apr/include/apr_general.h Index: apr_general.h =================================================================== RCS file: /home/cvs/apache-apr/include/apr_general.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr_general.h 1999/02/22 15:51:48 1.2 +++ apr_general.h 1999/02/23 21:23:45 1.3 @@ -59,4 +59,6 @@ #define TRUE 1 #define FALSE 0 +typedef int apr_int32_t; + #endif /* ! APR_GENERAL_H */