summaryrefslogtreecommitdiff
path: root/file_io
diff options
context:
space:
mode:
Diffstat (limited to 'file_io')
-rw-r--r--file_io/os2/dir.c7
-rw-r--r--file_io/os2/fileio.h3
-rw-r--r--file_io/os2/filestat.c11
-rw-r--r--file_io/os2/readwrite.c2
-rw-r--r--file_io/unix/dir.c4
-rw-r--r--file_io/unix/filestat.c22
-rw-r--r--file_io/unix/readwrite.c4
-rw-r--r--file_io/win32/dir.c2
-rw-r--r--file_io/win32/fileio.h12
-rw-r--r--file_io/win32/filestat.c8
-rw-r--r--file_io/win32/open.c4
-rw-r--r--file_io/win32/pipe.c14
12 files changed, 49 insertions, 44 deletions
diff --git a/file_io/os2/dir.c b/file_io/os2/dir.c
index 05674c69e..84529ba9e 100644
--- a/file_io/os2/dir.c
+++ b/file_io/os2/dir.c
@@ -172,7 +172,8 @@ apr_status_t apr_dir_entry_size(apr_ssize_t *size, apr_dir_t *thedir)
apr_status_t apr_dir_entry_mtime(apr_time_t *time, apr_dir_t *thedir)
{
if (thedir->validentry) {
- ap_os2_time_to_ap_time(time, thedir->entry.fdateLastWrite, thedir->entry.ftimeLastWrite);
+ apr_os2_time_to_apr_time(time, thedir->entry.fdateLastWrite,
+ thedir->entry.ftimeLastWrite);
return APR_SUCCESS;
}
@@ -181,12 +182,12 @@ apr_status_t apr_dir_entry_mtime(apr_time_t *time, apr_dir_t *thedir)
-apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
+apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir)
{
int rc;
HFILE hFile;
ULONG action, Type, Attr;
- ap_filetype_e typemap[8] = { APR_REG, APR_CHR, APR_PIPE };
+ apr_filetype_e typemap[8] = { APR_REG, APR_CHR, APR_PIPE };
if (thedir->validentry) {
if (thedir->entry.attrFile & FILE_DIRECTORY) {
diff --git a/file_io/os2/fileio.h b/file_io/os2/fileio.h
index 6aa1be1c5..5051cacc9 100644
--- a/file_io/os2/fileio.h
+++ b/file_io/os2/fileio.h
@@ -97,7 +97,8 @@ struct apr_dir_t {
};
apr_status_t apr_file_cleanup(void *);
-apr_status_t ap_os2_time_to_ap_time(apr_time_t *result, FDATE os2date, FTIME os2time);
+apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date,
+ FTIME os2time);
#endif /* ! FILE_IO_H */
diff --git a/file_io/os2/filestat.c b/file_io/os2/filestat.c
index 43dc3f152..544f95ad4 100644
--- a/file_io/os2/filestat.c
+++ b/file_io/os2/filestat.c
@@ -75,14 +75,17 @@ static void FS3_to_finfo(apr_finfo_t *finfo, FILESTATUS3 *fstatus)
finfo->inode = 0;
finfo->device = 0;
finfo->size = fstatus->cbFile;
- ap_os2_time_to_ap_time(&finfo->atime, fstatus->fdateLastAccess, fstatus->ftimeLastAccess );
- ap_os2_time_to_ap_time(&finfo->mtime, fstatus->fdateLastWrite, fstatus->ftimeLastWrite );
- ap_os2_time_to_ap_time(&finfo->ctime, fstatus->fdateCreation, fstatus->ftimeCreation );
+ apr_os2_time_to_apr_time(&finfo->atime, fstatus->fdateLastAccess,
+ fstatus->ftimeLastAccess );
+ apr_os2_time_to_apr_time(&finfo->mtime, fstatus->fdateLastWrite,
+ fstatus->ftimeLastWrite );
+ apr_os2_time_to_apr_time(&finfo->ctime, fstatus->fdateCreation,
+ fstatus->ftimeCreation );
}
-static apr_status_t handle_type(ap_filetype_e *ftype, HFILE file)
+static apr_status_t handle_type(apr_filetype_e *ftype, HFILE file)
{
ULONG filetype, fileattr, rc;
diff --git a/file_io/os2/readwrite.c b/file_io/os2/readwrite.c
index 5bf040ac3..310e2df9a 100644
--- a/file_io/os2/readwrite.c
+++ b/file_io/os2/readwrite.c
@@ -346,7 +346,7 @@ APR_EXPORT(int) apr_fprintf(apr_file_t *fptr, const char *format, ...)
-apr_status_t ap_file_check_read(apr_file_t *fd)
+apr_status_t apr_file_check_read(apr_file_t *fd)
{
int rc;
diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c
index 2bddb4a31..bfbf85ab3 100644
--- a/file_io/unix/dir.c
+++ b/file_io/unix/dir.c
@@ -200,11 +200,11 @@ apr_status_t apr_dir_entry_mtime(apr_time_t *mtime, apr_dir_t *thedir)
return errno;
}
- apr_ansi_time_to_ap_time(mtime, filestat.st_mtime);
+ apr_ansi_time_to_apr_time(mtime, filestat.st_mtime);
return APR_SUCCESS;
}
-apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
+apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir)
{
struct stat filestat;
char *fname = NULL;
diff --git a/file_io/unix/filestat.c b/file_io/unix/filestat.c
index 07fc4281f..0e14fdafd 100644
--- a/file_io/unix/filestat.c
+++ b/file_io/unix/filestat.c
@@ -57,9 +57,9 @@
#include "apr_general.h"
#include "apr_errno.h"
-static ap_filetype_e filetype_from_mode(int mode)
+static apr_filetype_e filetype_from_mode(int mode)
{
- ap_filetype_e type = APR_NOFILE;
+ apr_filetype_e type = APR_NOFILE;
if (S_ISREG(mode))
type = APR_REG;
@@ -92,9 +92,9 @@ apr_status_t apr_getfileinfo(apr_finfo_t *finfo, apr_file_t *thefile)
finfo->size = info.st_size;
finfo->inode = info.st_ino;
finfo->device = info.st_dev;
- apr_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
- apr_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
- apr_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
+ apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
+ apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
+ apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
return APR_SUCCESS;
}
else {
@@ -123,9 +123,9 @@ apr_status_t apr_stat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
finfo->size = info.st_size;
finfo->inode = info.st_ino;
finfo->device = info.st_dev;
- apr_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
- apr_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
- apr_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
+ apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
+ apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
+ apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
return APR_SUCCESS;
}
else {
@@ -145,9 +145,9 @@ apr_status_t apr_lstat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
finfo->size = info.st_size;
finfo->inode = info.st_ino;
finfo->device = info.st_dev;
- apr_ansi_time_to_ap_time(&finfo->atime, info.st_atime);
- apr_ansi_time_to_ap_time(&finfo->mtime, info.st_mtime);
- apr_ansi_time_to_ap_time(&finfo->ctime, info.st_ctime);
+ apr_ansi_time_to_apr_time(&finfo->atime, info.st_atime);
+ apr_ansi_time_to_apr_time(&finfo->mtime, info.st_mtime);
+ apr_ansi_time_to_apr_time(&finfo->ctime, info.st_ctime);
return APR_SUCCESS;
}
else {
diff --git a/file_io/unix/readwrite.c b/file_io/unix/readwrite.c
index 6fdb136c2..f013f0f89 100644
--- a/file_io/unix/readwrite.c
+++ b/file_io/unix/readwrite.c
@@ -74,8 +74,8 @@ static apr_status_t wait_for_io_or_timeout(apr_file_t *file, int for_read)
FD_ZERO(&fdset);
FD_SET(file->filedes, &fdset);
if (file->timeout >= 0) {
- tv.tv_sec = file->timeout / AP_USEC_PER_SEC;
- tv.tv_usec = file->timeout % AP_USEC_PER_SEC;
+ tv.tv_sec = file->timeout / APR_USEC_PER_SEC;
+ tv.tv_usec = file->timeout % APR_USEC_PER_SEC;
tvptr = &tv;
}
else {
diff --git a/file_io/win32/dir.c b/file_io/win32/dir.c
index a9ce5d3fa..2d0d6accb 100644
--- a/file_io/win32/dir.c
+++ b/file_io/win32/dir.c
@@ -179,7 +179,7 @@ apr_status_t apr_dir_entry_mtime(apr_time_t *time, apr_dir_t *thedir)
return APR_SUCCESS;
}
-apr_status_t apr_dir_entry_ftype(ap_filetype_e *type, apr_dir_t *thedir)
+apr_status_t apr_dir_entry_ftype(apr_filetype_e *type, apr_dir_t *thedir)
{
switch(thedir->entry->dwFileAttributes) {
case FILE_ATTRIBUTE_DIRECTORY: {
diff --git a/file_io/win32/fileio.h b/file_io/win32/fileio.h
index bfdda7421..661154ead 100644
--- a/file_io/win32/fileio.h
+++ b/file_io/win32/fileio.h
@@ -92,7 +92,7 @@
* fname -- the filename as passed to the open call.
* dwFileAttricutes -- Attributes used to open the file.
* demonfname -- the canonicalized filename. Used to store the result from
- * ap_os_canonicalize_filename.
+ * apr_os_canonicalize_filename.
* lowerdemonfname -- inserted at Ken Parzygnat's request, because of the
* ugly way windows deals with case in the filesystem.
* append -- Windows doesn't support the append concept when opening files.
@@ -143,12 +143,12 @@ struct apr_dir_t {
apr_status_t file_cleanup(void *);
/*mode_t get_fileperms(apr_fileperms_t);
*/
-APR_EXPORT(char *) ap_os_systemcase_filename(struct apr_pool_t *pCont,
- const char *szFile);
+APR_EXPORT(char *) apr_os_systemcase_filename(struct apr_pool_t *pCont,
+ const char *szFile);
char * canonical_filename(struct apr_pool_t *pCont, const char *szFile);
-apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out,
- BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite,
- apr_pool_t *p);
+apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out,
+ BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite,
+ apr_pool_t *p);
#endif /* ! FILE_IO_H */
diff --git a/file_io/win32/filestat.c b/file_io/win32/filestat.c
index 05082aacd..2477cf94d 100644
--- a/file_io/win32/filestat.c
+++ b/file_io/win32/filestat.c
@@ -66,9 +66,9 @@
#define S_ISREG(m) (((m) & (S_IFMT)) == S_IFREG)
#define S_ISDIR(m) (((m) & (S_IFDIR)) == S_IFDIR)
-static ap_filetype_e filetype_from_mode(int mode)
+static apr_filetype_e filetype_from_mode(int mode)
{
- ap_filetype_e type = APR_NOFILE;
+ apr_filetype_e type = APR_NOFILE;
if (S_ISREG(mode))
type = APR_REG;
@@ -194,7 +194,7 @@ apr_status_t apr_stat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
*/
WIN32_FIND_DATA FileInformation;
HANDLE hFind;
- ap_oslevel_e os_level;
+ apr_oslevel_e os_level;
apr_status_t rv = APR_SUCCESS;
memset(finfo,'\0', sizeof(*finfo));
@@ -208,7 +208,7 @@ apr_status_t apr_stat(apr_finfo_t *finfo, const char *fname, apr_pool_t *cont)
if (strlen(fname) >= MAX_PATH) {
rv = ERROR_FILENAME_EXCED_RANGE;
}
- else if (!ap_get_oslevel(cont, &os_level) && os_level >= APR_WIN_98) {
+ else if (!apr_get_oslevel(cont, &os_level) && os_level >= APR_WIN_98) {
if (!GetFileAttributesEx(fname, GetFileExInfoStandard,
(WIN32_FILE_ATTRIBUTE_DATA*) &FileInformation)) {
rv = GetLastError();
diff --git a/file_io/win32/open.c b/file_io/win32/open.c
index 689453a0b..b303465b5 100644
--- a/file_io/win32/open.c
+++ b/file_io/win32/open.c
@@ -82,7 +82,7 @@ apr_status_t apr_open(apr_file_t **new, const char *fname,
DWORD createflags = 0;
DWORD attributes = 0;
DWORD sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE;
- ap_oslevel_e level;
+ apr_oslevel_e level;
apr_status_t rv;
if ((*new) == NULL) {
@@ -117,7 +117,7 @@ apr_status_t apr_open(apr_file_t **new, const char *fname,
(*new)->demonfname = canonical_filename((*new)->cntxt, fname);
(*new)->lowerdemonfname = strlwr((*new)->demonfname);
- if (ap_get_oslevel(cont, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
+ if (apr_get_oslevel(cont, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
sharemode |= FILE_SHARE_DELETE;
}
diff --git a/file_io/win32/pipe.c b/file_io/win32/pipe.c
index 732ba577f..19c9e557b 100644
--- a/file_io/win32/pipe.c
+++ b/file_io/win32/pipe.c
@@ -108,10 +108,10 @@ apr_status_t apr_create_pipe(apr_file_t **in, apr_file_t **out, apr_pool_t *p)
return APR_SUCCESS;
}
-/* ap_create_nt_pipe()
+/* apr_create_nt_pipe()
* An internal (for now) APR function created for use by apr_create_process()
* when setting up pipes to communicate with the child process.
- * ap_create_nt_pipe() allows setting the blocking mode of each end of
+ * apr_create_nt_pipe() allows setting the blocking mode of each end of
* the pipe when the pipe is created (rather than after the pipe is created).
* A pipe handle must be opened in full async i/o mode in order to
* emulate Unix non-blocking pipes with timeouts.
@@ -128,11 +128,11 @@ apr_status_t apr_create_pipe(apr_file_t **in, apr_file_t **out, apr_pool_t *p)
*
* wgs
*/
-apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out,
- BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite,
- apr_pool_t *p)
+apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out,
+ BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite,
+ apr_pool_t *p)
{
- ap_oslevel_e level;
+ apr_oslevel_e level;
SECURITY_ATTRIBUTES sa;
static unsigned long id = 0;
DWORD dwPipeMode;
@@ -169,7 +169,7 @@ apr_status_t ap_create_nt_pipe(apr_file_t **in, apr_file_t **out,
(*out)->direction = 0;
(*out)->pOverlapped = NULL;
- if (ap_get_oslevel(p, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
+ if (apr_get_oslevel(p, &level) == APR_SUCCESS && level >= APR_WIN_NT) {
/* Create the read end of the pipe */
dwOpenMode = PIPE_ACCESS_INBOUND;
if (bAsyncRead) {
View Lorry Controller Status