rbb 99/06/23 08:00:12
Modified: apr/file_io/win32 file_io.def fileacc.c
apr/locks/win32 locks.c locks.def
apr/misc/win32 misc.def start.c
apr/network_io/win32 network_io.def poll.c sockets.c
apr/threadproc/win32 proc.c thread.c threadpriv.c
threadproc.def
apr/time/win32 access.c time.def
Log:
Bring Windows up to Unix so we can get user data on both systems.
Revision Changes Path
1.3 +2 -0 apache-apr/apr/file_io/win32/file_io.def
Index: file_io.def
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/win32/file_io.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file_io.def 1999/06/15 17:43:06 1.2
+++ file_io.def 1999/06/23 15:00:06 1.3
@@ -29,5 +29,7 @@
ap_read @22
ap_write @23
ap_seek @24
+ ap_get_filedata @25
+ ap_set_filedata @26
1.2 +21 -0 apache-apr/apr/file_io/win32/fileacc.c
Index: fileacc.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/file_io/win32/fileacc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fileacc.c 1999/06/03 19:43:44 1.1
+++ fileacc.c 1999/06/23 15:00:06 1.2
@@ -163,3 +163,24 @@
}
}
+ap_status_t ap_get_filedata(struct file_t *file, void *data)
+{
+ if (file != NULL) {
+ return ap_get_userdata(file->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOFILE;
+ }
+}
+
+ap_status_t ap_set_filedata(struct file_t *file, void *data)
+{
+ if (file != NULL) {
+ return ap_set_userdata(file->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOFILE;
+ }
+}
1.2 +20 -0 apache-apr/apr/locks/win32/locks.c
Index: locks.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/win32/locks.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locks.c 1999/06/18 19:10:59 1.1
+++ locks.c 1999/06/23 15:00:07 1.2
@@ -131,4 +131,24 @@
return APR_SUCCESS;
}
+ap_status_t ap_get_lockdata(struct lock_t *lock, void *data)
+{
+ if (lock != NULL) {
+ return ap_get_userdata(lock->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOLOCK;
+ }
+}
+ap_status_t ap_set_lockdata(struct lock_t *lock, void *data)
+{
+ if (lock != NULL) {
+ return ap_set_userdata(lock->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOLOCK;
+ }
+}
1.2 +2 -0 apache-apr/apr/locks/win32/locks.def
Index: locks.def
===================================================================
RCS file: /home/cvs/apache-apr/apr/locks/win32/locks.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locks.def 1999/06/18 19:10:59 1.1
+++ locks.def 1999/06/23 15:00:07 1.2
@@ -10,3 +10,5 @@
ap_unlock @3
ap_destroy_lock @4
ap_child_init_lock @5
+ ap_get_lockdata @6
+ ap_set_lockdata @7
1.3 +2 -0 apache-apr/apr/misc/win32/misc.def
Index: misc.def
===================================================================
RCS file: /home/cvs/apache-apr/apr/misc/win32/misc.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- misc.def 1999/06/02 19:51:48 1.2
+++ misc.def 1999/06/23 15:00:08 1.3
@@ -13,3 +13,5 @@
ap_destroy_context @6
WinTimeToUnixTime @7
ap_get_oslevel @8
+ ap_get_userdata @9
+ ap_set_userdata @10
\ No newline at end of file
1.5 +18 -0 apache-apr/apr/misc/win32/start.c
Index: start.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/misc/win32/start.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start.c 1999/06/15 17:43:16 1.4
+++ start.c 1999/06/23 15:00:08 1.5
@@ -176,3 +176,21 @@
return APR_EEXIST;
}
+ap_status_t ap_set_userdata(struct context_t *cont, void *data)
+{
+ if (cont) {
+ cont->prog_data = data;
+ return APR_SUCCESS;
+ }
+ return APR_ENOCONT;
+}
+
+ap_status_t ap_get_userdata(struct context_t *cont, void **data)
+{
+ if (cont) {
+ (*data) = cont->prog_data;
+ return APR_SUCCESS;
+ }
+ return APR_ENOCONT;
+}
+
1.2 +4 -0 apache-apr/apr/network_io/win32/network_io.def
Index: network_io.def
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/win32/network_io.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- network_io.def 1999/06/14 19:11:16 1.1
+++ network_io.def 1999/06/23 15:00:09 1.2
@@ -22,3 +22,7 @@
ap_poll @15
ap_add_poll_socket @16
ap_get_revents @17
+ ap_get_socketdata @18
+ ap_set_socketdata @19
+ ap_get_polldata @20
+ ap_set_polldata @21
\ No newline at end of file
1.3 +23 -1 apache-apr/apr/network_io/win32/poll.c
Index: poll.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/win32/poll.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poll.c 1999/06/15 17:01:55 1.2
+++ poll.c 1999/06/23 15:00:09 1.3
@@ -195,4 +195,26 @@
(*event) = revents;
return APR_SUCCESS;
}
-
+
+ap_status_t ap_get_polldata(struct pollfd_t *pollfd, void *data)
+{
+ if (pollfd != NULL) {
+ return ap_get_userdata(pollfd->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOFILE;
+ }
+}
+
+ap_status_t ap_set_polldata(struct pollfd_t *pollfd, void *data)
+{
+ if (pollfd != NULL) {
+ return ap_set_userdata(pollfd->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOFILE;
+ }
+}
+
1.3 +22 -0 apache-apr/apr/network_io/win32/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/network_io/win32/sockets.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sockets.c 1999/06/15 17:01:56 1.2
+++ sockets.c 1999/06/23 15:00:09 1.3
@@ -241,3 +241,25 @@
}
}
+ap_status_t ap_get_socketdata(struct socket_t *socket, void *data)
+{
+ if (socket != NULL) {
+ return ap_get_userdata(socket->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOSOCKET;
+ }
+}
+
+ap_status_t ap_set_socketdata(struct socket_t *socket, void *data)
+{
+ if (socket != NULL) {
+ return ap_set_userdata(socket->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOSOCKET;
+ }
+}
+
1.3 +22 -0 apache-apr/apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/win32/proc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- proc.c 1999/06/15 17:43:33 1.2
+++ proc.c 1999/06/23 15:00:10 1.3
@@ -297,3 +297,25 @@
return APR_EEXIST;
}
+ap_status_t ap_get_procdata(struct proc_t *proc, void *data)
+{
+ if (proc != NULL) {
+ return ap_get_userdata(proc->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOPROC;
+ }
+}
+
+ap_status_t ap_set_procdata(struct proc_t *proc, void *data)
+{
+ if (proc != NULL) {
+ return ap_set_userdata(proc->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOPROC;
+ }
+}
+
1.3 +22 -0 apache-apr/apr/threadproc/win32/thread.c
Index: thread.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/win32/thread.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- thread.c 1999/06/18 19:11:15 1.2
+++ thread.c 1999/06/23 15:00:10 1.3
@@ -156,4 +156,26 @@
}
}
+ap_status_t ap_get_threaddata(struct thread_t *thread, void *data)
+{
+ if (thread != NULL) {
+ return ap_get_userdata(thread->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOTHREAD;
+ }
+}
+
+ap_status_t ap_set_threaddata(struct thread_t *thread, void *data)
+{
+ if (thread != NULL) {
+ return ap_set_userdata(thread->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOTHREAD;
+ }
+}
+
1.2 +21 -0 apache-apr/apr/threadproc/win32/threadpriv.c
Index: threadpriv.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/win32/threadpriv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threadpriv.c 1999/06/08 15:38:11 1.1
+++ threadpriv.c 1999/06/23 15:00:10 1.2
@@ -89,3 +89,24 @@
return APR_EEXIST;
}
+ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, void *data)
+{
+ if (threadkey != NULL) {
+ return ap_get_userdata(threadkey->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOTHDKEY;
+ }
+}
+
+ap_status_t ap_set_threadkeydata(struct threadkey_t *threadkey, void *data)
+{
+ if (threadkey != NULL) {
+ return ap_set_userdata(threadkey->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOTHDKEY;
+ }
+}
1.2 +7 -1 apache-apr/apr/threadproc/win32/threadproc.def
Index: threadproc.def
===================================================================
RCS file: /home/cvs/apache-apr/apr/threadproc/win32/threadproc.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threadproc.def 1999/06/08 17:30:04 1.1
+++ threadproc.def 1999/06/23 15:00:10 1.2
@@ -27,4 +27,10 @@
ap_create_thread_private @20
ap_get_thread_private @21
ap_set_thread_private @22
- ap_delete_thread_private @23
\ No newline at end of file
+ ap_delete_thread_private @23
+ ap_get_threaddata @24
+ ap_set_threaddata @25
+ ap_get_threadkeydata @26
+ ap_set_threadkeydata @27
+ ap_get_procdata @28
+ ap_set_procdata @29
1.2 +22 -0 apache-apr/apr/time/win32/access.c
Index: access.c
===================================================================
RCS file: /home/cvs/apache-apr/apr/time/win32/access.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- access.c 1999/06/17 18:56:21 1.1
+++ access.c 1999/06/23 15:00:12 1.2
@@ -242,4 +242,26 @@
return APR_SUCCESS;
}
+ap_status_t ap_get_timedata(struct atime_t *atime, void *data)
+{
+ if (atime != NULL) {
+ return ap_get_userdata(atime->cntxt, &data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOTIME;
+ }
+}
+
+ap_status_t ap_set_timedata(struct atime_t *atime, void *data)
+{
+ if (atime != NULL) {
+ return ap_set_userdata(atime->cntxt, data);
+ }
+ else {
+ data = NULL;
+ return APR_ENOTIME;
+ }
+}
+
1.2 +2 -0 apache-apr/apr/time/win32/time.def
Index: time.def
===================================================================
RCS file: /home/cvs/apache-apr/apr/time/win32/time.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- time.def 1999/06/17 18:56:22 1.1
+++ time.def 1999/06/23 15:00:12 1.2
@@ -24,3 +24,5 @@
ap_set_mon @17
ap_set_year @18
ap_set_wday @19
+ ap_get_timedata @20
+ ap_set_timedata @21
\ No newline at end of file
