rbb 99/04/26 06:07:55
Modified: apr/file_io/unix fileacc.c
apr/network_io/unix sockets.c
apr/test ab_apr.c
include apr_file_io.h apr_network_io.h
docs fileio.txt networkio.txt threadproc.txt
Log:
Removing the apr_valid_* functions. There is an error condition returned
when the variable is created, so a function to determine if it is valid
or not isn't really needed.
Revision Changes Path
1.2 +0 -10 apache-apr/apr/file_io/unix/fileacc.c
Index: fileacc.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/unix/fileacc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fileacc.c 1999/04/12 17:48:19 1.1
+++ fileacc.c 1999/04/26 13:07:46 1.2
@@ -60,16 +60,6 @@
/* A file to put ALL of the accessor functions for apr_file_t types. */
-apr_status_t apr_valid_file(apr_file_t *thefile)
-{
- if (thefile != NULL && thefile->filedes > 0) {
- return APR_SUCCESS;
- }
- else {
- return APR_FAILURE;
- }
-}
-
char * apr_get_filename(apr_file_t *thefile)
{
if (thefile != NULL) {
1.10 +0 -7 apache-apr/apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/unix/sockets.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sockets.c 1999/04/23 13:34:50 1.9
+++ sockets.c 1999/04/26 13:07:48 1.10
@@ -180,10 +180,3 @@
}
}
-apr_status_t apr_valid_socket(apr_socket_t *sock)
-{
- if (sock->socketdes < 0)
- return APR_FAILURE;
- return APR_SUCCESS;
-}
-
1.4 +1 -2 apache-apr/apr/test/ab_apr.c
Index: ab_apr.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/test/ab_apr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ab_apr.c 1999/04/23 13:34:49 1.3
+++ ab_apr.c 1999/04/26 13:07:49 1.4
@@ -477,8 +477,7 @@
c->cbx = 0;
c->gotheader = 0;
- c->aprsock = apr_create_tcp_socket();
- if (apr_valid_socket(c->aprsock) == APR_FAILURE)
+ if ((c->aprsock = apr_create_tcp_socket()) ==NULL)
err("Socket:");
nonblock(c->aprsock);
gettimeofday(&c->start, 0);
1.19 +0 -1 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apr_file_io.h 1999/04/23 12:45:18 1.18
+++ apr_file_io.h 1999/04/26 13:07:50 1.19
@@ -130,7 +130,6 @@
char *apr_create_namedpipe(char *, apr_fileperms_t);
/*accessor and general file_io functions. */
-apr_status_t apr_valid_file(apr_file_t *);
char *apr_get_filename(apr_file_t *);
1.13 +0 -1 apache-apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apache-apr/include/apr_network_io.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- apr_network_io.h 1999/04/23 13:34:49 1.12
+++ apr_network_io.h 1999/04/26 13:07:50 1.13
@@ -107,7 +107,6 @@
void apr_sd_zero(apr_sd_set_t *);
/* accessor functions */
-apr_status_t apr_valid_socket(apr_socket_t *);
#endif /* ! APR_FILE_IO_H */
1.18 +0 -6 apache-apr/docs/fileio.txt
Index: fileio.txt
===================================================================
RCS file: /home/cvs/apache-apr/docs/fileio.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fileio.txt 1999/04/23 12:45:10 1.17
+++ fileio.txt 1999/04/26 13:07:52 1.18
@@ -154,12 +154,6 @@
Notes: apr_writev will write a complete entry from APRIOVec array before
moving on to the next one.
- apr_status_t apr_valid_file(apr_file_t *)
- Determine if a file is valid or not
- Arguments:
- arg 1) File to check for validity
- return) APR_SUCCESS or APR_FAILURE
-
char * apr_get_filename(apr_file_t *)
Get the name of an opened file.
Arguments:
1.15 +0 -6 apache-apr/docs/networkio.txt
Index: networkio.txt
===================================================================
RCS file: /home/cvs/apache-apr/docs/networkio.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- networkio.txt 1999/04/23 13:34:48 1.14
+++ networkio.txt 1999/04/26 13:07:53 1.15
@@ -154,12 +154,6 @@
arg 2) Size of buffer.
return) APR_SUCCESS or APR_FAILURE
- apr_status_t apr_socket_valid(apr_socket_t *)
- is the socket that was created valid?
- Arguments:
- arg 1) The socket to check
- return) APR_SUCCESS or APR_FAILURE
-
APRStatus apr_familyinet(APRInt16)
Get the value of the address family for IP
Arguments:
1.4 +1 -1 apache-apr/docs/threadproc.txt
Index: threadproc.txt
===================================================================
RCS file: /home/cvs/apache-apr/docs/threadproc.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- threadproc.txt 1999/04/23 18:00:00 1.3
+++ threadproc.txt 1999/04/26 13:07:53 1.4
@@ -52,7 +52,7 @@
arg 2) The starting directory for the new process.
return) APR_SUCCESS or APR_FAILURE
-apr_proc_t *apr_create_process(char *, char **, char **, const
apr_procattr_t *)
+apr_proc_t *apr_create_process(char *, char *, char **, const apr_procattr_t
*)
create a new process and run a new executable in it.
Arguments:
arg 1) Path name of the executable file
