rbb 99/12/02 09:05:52
Modified: src/lib/apr/file_io/unix dir.c filedup.c open.c seek.c
src/lib/apr/lib apr_md5.c apr_pools.c apr_tables.c
src/lib/apr/locks/unix locks.c
src/lib/apr/misc/unix start.c
src/lib/apr/network_io/unix sendrecv.c sockets.c
src/lib/apr/threadproc/unix procsup.c
Log:
Fix a couple of warnings that were caused by the APR leak problem. These
are gone now.
Revision Changes Path
1.17 +1 -0 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dir.c 1999/11/13 14:39:53 1.16
+++ dir.c 1999/12/02 17:05:33 1.17
@@ -58,6 +58,7 @@
#include <string.h>
#include <dirent.h>
#include <sys/stat.h>
+#include <unistd.h>
#include "fileio.h"
#include "apr_file_io.h"
#include "apr_lib.h"
1.5 +1 -0 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- filedup.c 1999/10/12 06:14:42 1.4
+++ filedup.c 1999/12/02 17:05:33 1.5
@@ -58,6 +58,7 @@
#include "apr_general.h"
#include "apr_lib.h"
#include <string.h>
+#include <unistd.h>
/* ***APRDOC********************************************************
* ap_status_t ap_dupfile(ap_file_t **, ap_file_t *)
1.24 +1 -0 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- open.c 1999/11/15 15:05:12 1.23
+++ open.c 1999/12/02 17:05:34 1.24
@@ -61,6 +61,7 @@
#include <errno.h>
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
ap_status_t file_cleanup(void *thefile)
{
1.2 +1 -0 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seek.c 1999/08/17 15:59:36 1.1
+++ seek.c 1999/12/02 17:05:35 1.2
@@ -57,6 +57,7 @@
#include "apr_file_io.h"
#include <errno.h>
#include <string.h>
+#include <unistd.h>
/* ***APRDOC********************************************************
* ap_status_t ap_seek(ap_file_t *, ap_seek_where_t, ap_off_t *)
1.5 +3 -0 apache-2.0/src/lib/apr/lib/apr_md5.c
Index: apr_md5.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_md5.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apr_md5.c 1999/11/22 18:01:28 1.4
+++ apr_md5.c 1999/12/02 17:05:39 1.5
@@ -104,6 +104,9 @@
#include "apr_md5.h"
#include "apr_lib.h"
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
#ifdef HAVE_CRYPT_H
#include <crypt.h>
#endif
1.25 +3 -0 apache-2.0/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apr_pools.c 1999/12/01 18:39:35 1.24
+++ apr_pools.c 1999/12/02 17:05:40 1.25
@@ -85,6 +85,9 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
1.7 +3 -0 apache-2.0/src/lib/apr/lib/apr_tables.c
Index: apr_tables.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apr_tables.c 1999/11/23 21:22:48 1.6
+++ apr_tables.c 1999/12/02 17:05:40 1.7
@@ -78,6 +78,9 @@
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
/*****************************************************************
* This file contains array and ap_table_t functions only.
1.14 +1 -0 apache-2.0/src/lib/apr/locks/unix/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- locks.c 1999/12/01 18:39:41 1.13
+++ locks.c 1999/12/02 17:05:45 1.14
@@ -59,6 +59,7 @@
#include "apr_lib.h"
#include "locks.h"
#include <string.h>
+#include <unistd.h>
/* ***APRDOC********************************************************
* ap_status_t ap_create_lock(ap_context_t *, ap_locktype_e, char *,
1.14 +1 -0 apache-2.0/src/lib/apr/misc/unix/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- start.c 1999/11/24 22:30:09 1.13
+++ start.c 1999/12/02 17:05:47 1.14
@@ -217,6 +217,7 @@
}
else {
cont->apr_abort = apr_abort;
+ return APR_SUCCESS;
}
}
1.6 +1 -0 apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
Index: sendrecv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sendrecv.c 1999/11/15 19:49:51 1.5
+++ sendrecv.c 1999/12/02 17:05:48 1.6
@@ -61,6 +61,7 @@
#include "apr_network_io.h"
#include "apr_lib.h"
#include <sys/time.h>
+#include <unistd.h>
/* ***APRDOC********************************************************
* ap_status_t ap_send(ap_socket_t *, const char *, ap_ssize_t *, time_t)
1.25 +1 -0 apache-2.0/src/lib/apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sockets.c 1999/11/07 07:35:42 1.24
+++ sockets.c 1999/12/02 17:05:49 1.25
@@ -60,6 +60,7 @@
#include "apr_lib.h"
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#include <sys/socket.h>
#include <netinet/tcp.h>
#include <netinet/in.h>
1.8 +1 -0 apache-2.0/src/lib/apr/threadproc/unix/procsup.c
Index: procsup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- procsup.c 1999/10/15 14:20:23 1.7
+++ procsup.c 1999/12/02 17:05:51 1.8
@@ -61,6 +61,7 @@
#include "apr_file_io.h"
#include "apr_general.h"
#include "apr_lib.h"
+#include <unistd.h>
/* ***APRDOC********************************************************
* ap_status_t ap_detach(ap_context_t *, ap_proc_t *)
