You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@locus.apache.org on 2000/04/14 02:58:42 UTC
cvs commit: apache-2.0/src/lib/apr/file_io/unix dir.c fileacc.c filedup.c fileio.h open.c pipe.c
dgaudet 00/04/13 17:58:42
Modified: src/lib/apr/file_io/unix dir.c fileacc.c filedup.c fileio.h
open.c pipe.c
Log:
- namespace cleanup:
get_fileperms -> ap_unix_get_fileperms
file_cleanup -> ap_unix_file_cleanup
- removed unused buf_oflags variables
Revision Changes Path
1.27 +1 -1 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- dir.c 2000/04/14 00:54:59 1.26
+++ dir.c 2000/04/14 00:58:37 1.27
@@ -145,7 +145,7 @@
ap_status_t ap_make_dir(const char *path, ap_fileperms_t perm, ap_context_t *cont)
{
- mode_t mode = get_fileperms(perm);
+ mode_t mode = ap_unix_get_fileperms(perm);
if (mkdir(path, mode) == 0) {
return APR_SUCCESS;
1.23 +1 -1 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- fileacc.c 2000/04/14 00:55:00 1.22
+++ fileacc.c 2000/04/14 00:58:37 1.23
@@ -71,7 +71,7 @@
}
}
-mode_t get_fileperms(ap_fileperms_t mode)
+mode_t ap_unix_get_fileperms(ap_fileperms_t mode)
{
mode_t rv = 0;
1.17 +1 -2 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- filedup.c 2000/04/14 00:55:00 1.16
+++ filedup.c 2000/04/14 00:58:38 1.17
@@ -56,7 +56,6 @@
ap_status_t ap_dupfile(ap_file_t **new_file, ap_file_t *old_file)
{
- char *buf_oflags;
int have_file = 0;
if (new_file == NULL || old_file == NULL)
@@ -80,7 +79,7 @@
(*new_file)->filedes = dup(old_file->filedes);
}
(*new_file)->fname = ap_pstrdup(old_file->cntxt, old_file->fname);
- ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file), file_cleanup,
+ ap_register_cleanup((*new_file)->cntxt, (void *)(*new_file), ap_unix_file_cleanup,
ap_null_cleanup);
return APR_SUCCESS;
}
1.15 +2 -2 apache-2.0/src/lib/apr/file_io/unix/fileio.h
Index: fileio.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fileio.h 2000/04/06 23:25:05 1.14
+++ fileio.h 2000/04/14 00:58:38 1.15
@@ -118,8 +118,8 @@
struct dirent *entry;
};
-ap_status_t file_cleanup(void *);
-mode_t get_fileperms(ap_fileperms_t);
+ap_status_t ap_unix_file_cleanup(void *);
+mode_t ap_unix_get_fileperms(ap_fileperms_t);
#endif /* ! FILE_IO_H */
1.44 +5 -6 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- open.c 2000/04/14 00:55:00 1.43
+++ open.c 2000/04/14 00:58:38 1.44
@@ -55,7 +55,7 @@
#include "fileio.h"
#include "apr_portable.h"
-ap_status_t file_cleanup(void *thefile)
+ap_status_t ap_unix_file_cleanup(void *thefile)
{
ap_file_t *file = thefile;
int rv;
@@ -75,7 +75,6 @@
ap_status_t ap_open(ap_file_t **new, const char *fname, ap_int32_t flag, ap_fileperms_t perm, ap_context_t *cont)
{
int oflags = 0;
- char *buf_oflags;
if (new == NULL)
return APR_EBADARG;
@@ -124,7 +123,7 @@
(*new)->filedes = open(fname, oflags, 0777);
}
else {
- (*new)->filedes = open(fname, oflags, get_fileperms(perm));
+ (*new)->filedes = open(fname, oflags, ap_unix_get_fileperms(perm));
}
if ((*new)->filedes < 0) {
@@ -140,7 +139,7 @@
(*new)->timeout = -1;
(*new)->ungetchar = -1;
(*new)->eof_hit = 0;
- ap_register_cleanup((*new)->cntxt, (void *)(*new), file_cleanup,
+ ap_register_cleanup((*new)->cntxt, (void *)(*new), ap_unix_file_cleanup,
ap_null_cleanup);
return APR_SUCCESS;
}
@@ -152,8 +151,8 @@
if (file == NULL)
return APR_EBADARG;
- if ((rv = file_cleanup(file)) == APR_SUCCESS) {
- ap_kill_cleanup(file->cntxt, file, file_cleanup);
+ if ((rv = ap_unix_file_cleanup(file)) == APR_SUCCESS) {
+ ap_kill_cleanup(file->cntxt, file, ap_unix_file_cleanup);
return APR_SUCCESS;
}
return rv;
1.24 +1 -1 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pipe.c 2000/04/14 00:55:00 1.23
+++ pipe.c 2000/04/14 00:58:38 1.24
@@ -123,7 +123,7 @@
ap_status_t ap_create_namedpipe(char *filename,
ap_fileperms_t perm, ap_context_t *cont)
{
- mode_t mode = get_fileperms(perm);
+ mode_t mode = ap_unix_get_fileperms(perm);
if (mkfifo(filename, mode) == -1) {
return errno;