rbb 99/10/15 07:20:32
Modified: src/lib/apr/file_io/unix fileacc.c
src/lib/apr/file_io/win32 fileacc.c
src/lib/apr/include apr_file_io.h apr_network_io.h
apr_thread_proc.h
src/lib/apr/locks/unix locks.c
src/lib/apr/locks/win32 locks.c
src/lib/apr/network_io/beos poll.c sockets.c
src/lib/apr/network_io/unix poll.c sockets.c
src/lib/apr/network_io/win32 poll.c sockets.c
src/lib/apr/test ab_apr.c htdigest.c testcontext.c
testfile.c
src/lib/apr/threadproc/beos procsup.c
src/lib/apr/threadproc/unix proc.c procsup.c thread.c
threadpriv.c
src/lib/apr/threadproc/win32 proc.c thread.c threadpriv.c
src/lib/apr/time/unix access.c
src/lib/apr/time/win32 access.c
Log:
Fix a bug in the logic to set/get userdata from ALL apr types. I have
known about this bug for a while, but I am just now finding the time to
fix it. :)
Revision Changes Path
1.10 +3 -3 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fileacc.c 1999/10/08 20:03:36 1.9
+++ fileacc.c 1999/10/15 14:19:50 1.10
@@ -251,16 +251,16 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_filedata(void *, char *key, ap_file_t *)
+ * ap_status_t ap_get_filedata(void **, char *key, ap_file_t *)
* Return the data associated with the current file.
* arg 1) The currently open file.
* arg 2) The key to use for retreiving data associated with this file.
* arg 3) The user data associated with the file.
*/
-ap_status_t ap_get_filedata(void *data, char *key, struct file_t *file)
+ap_status_t ap_get_filedata(void **data, char *key, struct file_t *file)
{
if (file != NULL) {
- return ap_get_userdata(&data, key, file->cntxt);
+ return ap_get_userdata(data, key, file->cntxt);
}
else {
data = NULL;
1.8 +2 -2 apache-2.0/src/lib/apr/file_io/win32/fileacc.c
Index: fileacc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileacc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fileacc.c 1999/10/08 20:03:41 1.7
+++ fileacc.c 1999/10/15 14:19:54 1.8
@@ -180,10 +180,10 @@
return APR_ENOFILE;
}
}
-ap_status_t ap_get_filedata(void *data, char *key, struct file_t *file)
+ap_status_t ap_get_filedata(void **data, char *key, struct file_t *file)
{
if (file != NULL) {
- return ap_get_userdata(&data, key, file->cntxt);
+ return ap_get_userdata(data, key, file->cntxt);
}
else {
data = NULL;
1.17 +1 -1 apache-2.0/src/lib/apr/include/apr_file_io.h
Index: apr_file_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_file_io.h 1999/10/14 14:36:33 1.16
+++ apr_file_io.h 1999/10/15 14:19:56 1.17
@@ -148,7 +148,7 @@
/*accessor and general file_io functions. */
ap_status_t ap_get_filename(char **, ap_file_t *);
ap_status_t ap_get_dir_filename(char **, ap_dir_t *);
-ap_status_t ap_get_filedata(void *, char *, ap_file_t *);
+ap_status_t ap_get_filedata(void **, char *, ap_file_t *);
ap_status_t ap_set_filedata(ap_file_t *, void *, char *,
ap_status_t (*cleanup) (void *));
1.11 +1 -1 apache-2.0/src/lib/apr/include/apr_network_io.h
Index: apr_network_io.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apr_network_io.h 1999/10/10 20:34:54 1.10
+++ apr_network_io.h 1999/10/15 14:19:57 1.11
@@ -115,7 +115,7 @@
ap_status_t ap_get_remote_hostname(char **, ap_socket_t *);
ap_status_t ap_gethostname(char *, int, ap_context_t *);
-ap_status_t ap_get_socketdata(void *, char *, ap_socket_t *);
+ap_status_t ap_get_socketdata(void **, char *, ap_socket_t *);
ap_status_t ap_set_socketdata(ap_socket_t *, void *, char *,
ap_status_t (*cleanup) (void*));
1.9 +2 -2 apache-2.0/src/lib/apr/include/apr_thread_proc.h
Index: apr_thread_proc.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_thread_proc.h 1999/10/11 17:51:48 1.8
+++ apr_thread_proc.h 1999/10/15 14:19:58 1.9
@@ -95,7 +95,7 @@
ap_status_t ap_cancel_thread(ap_thread_t *);
ap_status_t ap_setcanceltype(ap_int32_t, ap_context_t *);
ap_status_t ap_setcancelstate(ap_int32_t, ap_context_t *);
-ap_status_t ap_get_threaddata(void *, char *, ap_thread_t *);
+ap_status_t ap_get_threaddata(void **, char *, ap_thread_t *);
ap_status_t ap_set_threaddata(void *, char *,
ap_status_t (*cleanup) (void *), ap_thread_t
*);
@@ -104,7 +104,7 @@
ap_status_t ap_get_thread_private(void **, ap_key_t *);
ap_status_t ap_set_thread_private(void *, ap_key_t *);
ap_status_t ap_delete_thread_private(ap_key_t *);
-ap_status_t ap_get_threadkeydata(void *, char *, ap_key_t *);
+ap_status_t ap_get_threadkeydata(void **, char *, ap_key_t *);
ap_status_t ap_set_threadkeydata(void *, char *,
ap_status_t (*cleanup) (void *), ap_key_t
*);
1.10 +1 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- locks.c 1999/10/11 17:57:07 1.9
+++ locks.c 1999/10/15 14:20:01 1.10
@@ -210,7 +210,7 @@
ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
{
if (lock != NULL) {
- return ap_get_userdata(&data, key, lock->cntxt);
+ return ap_get_userdata(data, key, lock->cntxt);
}
else {
data = NULL;
1.11 +1 -1 apache-2.0/src/lib/apr/locks/win32/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- locks.c 1999/10/12 12:20:02 1.10
+++ locks.c 1999/10/15 14:20:05 1.11
@@ -167,7 +167,7 @@
ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
{
if (lock != NULL) {
- return ap_get_userdata(&data, key, lock->cntxt);
+ return ap_get_userdata(data, key, lock->cntxt);
}
else {
data = NULL;
1.6 +1 -1 apache-2.0/src/lib/apr/network_io/beos/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poll.c 1999/10/10 20:34:55 1.5
+++ poll.c 1999/10/15 14:20:07 1.6
@@ -210,7 +210,7 @@
ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
{
if (pollfd != NULL) {
- return ap_get_userdata(&data, key, pollfd->cntxt);
+ return ap_get_userdata(data, key, pollfd->cntxt);
}
else {
data = NULL;
1.8 +2 -2 apache-2.0/src/lib/apr/network_io/beos/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sockets.c 1999/10/10 20:34:55 1.7
+++ sockets.c 1999/10/15 14:20:09 1.8
@@ -216,10 +216,10 @@
return APR_SUCCESS;
}
-ap_status_t ap_get_socketdata(void *data, char *key, struct socket_t *sock)
+ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t *sock)
{
if (socket != NULL) {
- return ap_get_userdata(&data, key, sock->cntxt);
+ return ap_get_userdata(data, key, sock->cntxt);
}
else {
data = NULL;
1.14 +1 -1 apache-2.0/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- poll.c 1999/10/10 20:34:57 1.13
+++ poll.c 1999/10/15 14:20:13 1.14
@@ -435,7 +435,7 @@
ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
{
if (pollfd != NULL) {
- return ap_get_userdata(&data, key, pollfd->cntxt);
+ return ap_get_userdata(data, key, pollfd->cntxt);
}
else {
data = NULL;
1.16 +3 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sockets.c 1999/10/10 20:34:57 1.15
+++ sockets.c 1999/10/15 14:20:13 1.16
@@ -318,15 +318,15 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_socketdata(void *, char *, ap_socket_t *)
+ * ap_status_t ap_get_socketdata(void **, char *, ap_socket_t *)
* Return the context associated with the current socket.
* arg 1) The currently open socket.
* arg 2) The user data associated with the socket.
*/
-ap_status_t ap_get_socketdata(void *data, char *key, struct socket_t *sock)
+ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t *sock)
{
if (socket != NULL) {
- return ap_get_userdata(&data, key, sock->cntxt);
+ return ap_get_userdata(data, key, sock->cntxt);
}
else {
data = NULL;
1.7 +1 -1 apache-2.0/src/lib/apr/network_io/win32/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poll.c 1999/10/10 20:34:58 1.6
+++ poll.c 1999/10/15 14:20:14 1.7
@@ -199,7 +199,7 @@
ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
{
if (pollfd != NULL) {
- return ap_get_userdata(&data, key, pollfd->cntxt);
+ return ap_get_userdata(data, key, pollfd->cntxt);
}
else {
data = NULL;
1.10 +2 -2 apache-2.0/src/lib/apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sockets.c 1999/10/10 20:34:59 1.9
+++ sockets.c 1999/10/15 14:20:15 1.10
@@ -253,10 +253,10 @@
}
}
-ap_status_t ap_get_socketdata(void *data, char *key, struct socket_t *socket)
+ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t
*socket)
{
if (socket != NULL) {
- return ap_get_userdata(&data, key, socket->cntxt);
+ return ap_get_userdata(data, key, socket->cntxt);
}
else {
data = NULL;
1.9 +8 -1 apache-2.0/src/lib/apr/test/ab_apr.c
Index: ab_apr.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/ab_apr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ab_apr.c 1999/10/14 14:36:34 1.8
+++ ab_apr.c 1999/10/15 14:20:17 1.9
@@ -106,8 +106,15 @@
#include "apr_network_io.h"
#include "apr_file_io.h"
#include "apr_time.h"
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
+#ifdef HAVE_STDIO_H
#include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
/* ------------------- DEFINITIONS -------------------------- */
/* maximum number of requests on a time limited test */
@@ -856,7 +863,7 @@
static int open_postfile(char *pfile)
{
ap_file_t *postfd = NULL;
- ap_fileperms_t mode;
+ ap_fileperms_t mode = APR_OS_DEFAULT;
ap_ssize_t length;
if (ap_open(&postfd, pfile, APR_READ, mode, cntxt) != APR_SUCCESS) {
1.8 +4 -0 apache-2.0/src/lib/apr/test/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- htdigest.c 1999/10/14 14:36:35 1.7
+++ htdigest.c 1999/10/15 14:20:18 1.8
@@ -75,6 +75,10 @@
#include <signal.h>
#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
#ifdef WIN32
#include <conio.h>
#endif
1.4 +2 -0 apache-2.0/src/lib/apr/test/testcontext.c
Index: testcontext.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testcontext.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testcontext.c 1999/10/08 20:04:29 1.3
+++ testcontext.c 1999/10/15 14:20:18 1.4
@@ -89,4 +89,6 @@
else {
fprintf(stdout, "User data is not working\n");
}
+
+ return 1;
}
1.7 +24 -3 apache-2.0/src/lib/apr/test/testfile.c
Index: testfile.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testfile.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testfile.c 1999/10/14 14:36:35 1.6
+++ testfile.c 1999/10/15 14:20:19 1.7
@@ -71,12 +71,13 @@
ap_file_t *thefile = NULL;
ap_status_t status = 0;
ap_int32_t flag = APR_READ | APR_WRITE | APR_CREATE;
- ap_uint64_t rv = 0;
ap_ssize_t nbytes = 0;
ap_off_t zer = 0;
char *buf;
char *str;
char *filename = "test.fil";
+ char *teststr;
+
if (ap_create_context(&context, NULL) != APR_SUCCESS) {
fprintf(stderr, "Couldn't allocate context.");
exit(-1);
@@ -151,6 +152,26 @@
fprintf(stdout, "OK\n");
}
+ fprintf(stdout, "\tAdding user data to the file.......");
+ status = ap_set_filedata(thefile, "This is a test", "test",
ap_null_cleanup);
+ if (status != APR_SUCCESS) {
+ fprintf(stderr, "Couldn't add the data\n");
+ exit(-1);
+ }
+ else {
+ fprintf(stdout, "OK\n");
+ }
+
+ fprintf(stdout, "\tGetting user data from the file.......");
+ status = ap_get_filedata((void **)&teststr, "test", thefile);
+ if (status != APR_SUCCESS || strcmp(teststr, "This is a test")) {
+ fprintf(stderr, "Couldn't get the data\n");
+ exit(-1);
+ }
+ else {
+ fprintf(stdout, "OK\n");
+ }
+
fprintf(stdout, "\tClosing File.......");
status = ap_close(thefile);
if (status != APR_SUCCESS) {
@@ -180,10 +201,10 @@
else {
fprintf(stdout, "OK\n");
}
-
+
testdirs(context);
test_filedel(context);
-
+
return 1;
}
1.6 +1 -1 apache-2.0/src/lib/apr/threadproc/beos/procsup.c
Index: procsup.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- procsup.c 1999/10/11 17:52:06 1.5
+++ procsup.c 1999/10/15 14:20:20 1.6
@@ -100,7 +100,7 @@
ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
{
if (proc != NULL) {
- return ap_get_userdata(&data, key, proc->cntxt);
+ return ap_get_userdata(data, key, proc->cntxt);
}
else {
data = NULL;
1.7 +1 -1 apache-2.0/src/lib/apr/threadproc/unix/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- proc.c 1999/10/11 17:52:17 1.6
+++ proc.c 1999/10/15 14:20:22 1.7
@@ -260,7 +260,7 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_fork_detach(ap_proc_t **, ap_context_t *)
+ * ap_status_t ap_fork(ap_proc_t **, ap_context_t *)
* This is currently the only non-portable call in APR. This executes
* a standard unix fork.
* arg 1) The context to use.
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- procsup.c 1999/10/11 17:52:18 1.6
+++ procsup.c 1999/10/15 14:20:23 1.7
@@ -141,7 +141,7 @@
ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
{
if (proc != NULL) {
- return ap_get_userdata(&data, key, proc->cntxt);
+ return ap_get_userdata(data, key, proc->cntxt);
}
else {
data = NULL;
1.7 +5 -5 apache-2.0/src/lib/apr/threadproc/unix/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- thread.c 1999/10/11 17:52:19 1.6
+++ thread.c 1999/10/15 14:20:23 1.7
@@ -219,15 +219,15 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_threaddata(void *, char *, ap_thread_t *)
+ * ap_status_t ap_get_threaddata(void **, char *, ap_thread_t *)
* Return the context associated with the current thread.
* arg 1) The currently open thread.
* arg 2) The user data associated with the thread.
*/
-ap_status_t ap_get_threaddata(void *data, char *key, struct thread_t *thread)
+ap_status_t ap_get_threaddata(void **data, char *key, struct thread_t
*thread)
{
if (thread != NULL) {
- return ap_get_userdata(&data, key, thread->cntxt);
+ return ap_get_userdata(data, key, thread->cntxt);
}
else {
data = NULL;
@@ -332,12 +332,12 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_threaddata(void *, char *, ap_thread_t *)
+ * ap_status_t ap_get_threaddata(void **, char *, ap_thread_t *)
* Return the context associated with the current thread.
* arg 1) The currently open thread.
* arg 2) The user data associated with the thread.
*/
-ap_status_t ap_get_threaddata(void *data, char *key, struct thread_t *thread)
+ap_status_t ap_get_threaddata(void **data, char *key, struct thread_t
*thread)
{
data = NULL;
return APR_ENOTHREAD;
1.7 +4 -4 apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- threadpriv.c 1999/10/11 17:52:19 1.6
+++ threadpriv.c 1999/10/15 14:20:24 1.7
@@ -131,15 +131,15 @@
}
/* ***APRDOC********************************************************
- * ap_status_t ap_get_threadkeydata(void *, char *, ap_threadkey_t *)
+ * ap_status_t ap_get_threadkeydata(void **, char *, ap_threadkey_t *)
* Return the context associated with the current threadkey.
* arg 1) The currently open threadkey.
* arg 2) The user data associated with the threadkey.
*/
-ap_status_t ap_get_threadkeydata(void *data, char *key, struct threadkey_t
*threadkey)
+ap_status_t ap_get_threadkeydata(void **data, char *key, struct threadkey_t
*threadkey)
{
if (threadkey != NULL) {
- return ap_get_userdata(&data, key, threadkey->cntxt);
+ return ap_get_userdata(data, key, threadkey->cntxt);
}
else {
data = NULL;
@@ -234,7 +234,7 @@
* arg 1) The currently open threadkey.
* arg 2) The user data associated with the threadkey.
*/
-ap_status_t ap_get_threadkeydata(void *data, char *key, struct threadkey_t
*threadkey)
+ap_status_t ap_get_threadkeydata(void **data, char *key, struct threadkey_t
*threadkey)
{
return APR_SUCCESS;
}
1.9 +12 -1 apache-2.0/src/lib/apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- proc.c 1999/10/12 19:13:52 1.8
+++ proc.c 1999/10/15 14:20:26 1.9
@@ -171,9 +171,15 @@
return APR_SUCCESS;
}
+<<<<<<< proc.c
+ap_status_t ap_create_process(struct proc_t **new, char *progname,
+ char *const args[], char **env,
+ struct procattr_t *attr, ap_context_t *cont)
+=======
ap_status_t ap_create_process(struct proc_t **new, const char *progname,
char *const args[], char **env,
struct procattr_t *attr, ap_context_t *cont)
+>>>>>>> 1.8
{
int i, iEnvBlockLen;
char *cmdline;
@@ -369,7 +375,7 @@
ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
{
if (proc != NULL) {
- return ap_get_userdata(&data, key, proc->cntxt);
+ return ap_get_userdata(data, key, proc->cntxt);
}
else {
data = NULL;
@@ -389,8 +395,13 @@
return APR_ENOPROC;
}
}
+<<<<<<< proc.c
+
+ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
+=======
*/
ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
+>>>>>>> 1.8
{
if (proc == NULL) {
return APR_ENOPROC;
1.8 +2 -2 apache-2.0/src/lib/apr/threadproc/win32/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thread.c 1999/10/11 17:52:21 1.7
+++ thread.c 1999/10/15 14:20:27 1.8
@@ -156,10 +156,10 @@
}
}
-ap_status_t ap_get_threaddata(void *data, char *key, struct thread_t *thread)
+ap_status_t ap_get_threaddata(void **data, char *key, struct thread_t
*thread)
{
if (thread != NULL) {
- return ap_get_userdata(&data, key, thread->cntxt);
+ return ap_get_userdata(data, key, thread->cntxt);
}
else {
data = NULL;
1.8 +2 -2 apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- threadpriv.c 1999/10/12 12:12:47 1.7
+++ threadpriv.c 1999/10/15 14:20:27 1.8
@@ -91,10 +91,10 @@
return APR_EEXIST;
}
-ap_status_t ap_get_threadkeydata(void *data, char *key, struct threadkey_t
*threadkey)
+ap_status_t ap_get_threadkeydata(void **data, char *key, struct threadkey_t
*threadkey)
{
if (threadkey != NULL) {
- return ap_get_userdata(&data, key, threadkey->cntxt);
+ return ap_get_userdata(data, key, threadkey->cntxt);
}
else {
data = NULL;
1.6 +1 -1 apache-2.0/src/lib/apr/time/unix/access.c
Index: access.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/access.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- access.c 1999/10/08 20:04:42 1.5
+++ access.c 1999/10/15 14:20:29 1.6
@@ -343,7 +343,7 @@
ap_status_t ap_get_timedata(struct atime_t *atime, char *key, void *data)
{
if (atime != NULL) {
- return ap_get_userdata(&data, key, atime->cntxt);
+ return ap_get_userdata(data, key, atime->cntxt);
}
else {
data = NULL;
1.5 +1 -1 apache-2.0/src/lib/apr/time/win32/access.c
Index: access.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/time/win32/access.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- access.c 1999/10/08 20:04:44 1.4
+++ access.c 1999/10/15 14:20:30 1.5
@@ -245,7 +245,7 @@
ap_status_t ap_get_timedata(struct atime_t *atime, char *key, void *data)
{
if (atime != NULL) {
- return ap_get_userdata(&data, key, atime->cntxt);
+ return ap_get_userdata(data, key, atime->cntxt);
}
else {
data = NULL;
