You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2003/11/20 18:48:08 UTC
cvs commit: apr/misc/unix otherchild.c
wrowe 2003/11/20 09:48:08
Modified: . CHANGES
include apr_thread_proc.h
misc/unix otherchild.c
Log:
Drop deprecated apr_proc_{...} functions with detailed CHANGES notes.
Revision Changes Path
1.442 +8 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -r1.441 -r1.442
--- CHANGES 20 Nov 2003 17:40:16 -0000 1.441
+++ CHANGES 20 Nov 2003 17:48:08 -0000 1.442
@@ -7,6 +7,13 @@
Changes with APR 1.0
+ *) Removed deprecated interface apr_proc_other_child_check()
+ that behaved differently between win32 and unix.
+ The unix behavor is now accomplished with
+ apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART)
+ The win32 behavor is now accomplished with
+ apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING)
+
*) Removed apr_socket_opt_{get|set}(..., APR_SO_TIMEOUT) which
was deprecated in favor of apr_socket_timeout_{get|set}().
@@ -56,6 +63,7 @@
apr_pool_get_parent -> apr_pool_parent_get
apr_pool_set_abort -> apr_pool_abort_set
apr_pool_sub_make -> apr_pool_create_ex
+ apr_proc_other_child_read -> apr_proc_other_child_alert
apr_recv -> apr_socket_recv
apr_recvfrom -> apr_socket_recvfrom
apr_send -> apr_socket_send
1.100 +0 -14 apr/include/apr_thread_proc.h
Index: apr_thread_proc.h
===================================================================
RCS file: /home/cvs/apr/include/apr_thread_proc.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- apr_thread_proc.h 3 Nov 2003 15:44:41 -0000 1.99
+++ apr_thread_proc.h 20 Nov 2003 17:48:08 -0000 1.100
@@ -715,20 +715,6 @@
*/
APR_DECLARE(void) apr_proc_other_child_refresh_all(int reason);
-/** @deprecated @see apr_proc_other_child_refresh_all
- * @remark Call apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART)
- * or apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING) instead.
- * @bug The differing implementations of this function on Win32 (_RUNNING checks)
- * and Unix (used only for _RESTART) are the reason it will be dropped with APR 1.0.
- */
-APR_DECLARE(void) apr_proc_other_child_check(void);
-
-/** @deprecated @see apr_proc_other_child_alert
- * @bug This function's name had nothing to do with it's purpose
- */
-APR_DECLARE(apr_status_t) apr_proc_other_child_read(apr_proc_t *proc, int status);
-
-
/**
* Terminate a process.
* @param proc The process to terminate.
1.36 +0 -25 apr/misc/unix/otherchild.c
Index: otherchild.c
===================================================================
RCS file: /home/cvs/apr/misc/unix/otherchild.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- otherchild.c 4 Mar 2003 00:06:33 -0000 1.35
+++ otherchild.c 20 Nov 2003 17:48:08 -0000 1.36
@@ -257,28 +257,3 @@
}
#endif /* APR_HAS_OTHER_CHILD */
-
-
-/* XXX: deprecated for removal in 1.0
- * The checks behaved differently between win32 and unix, while
- * the old win32 code did a health check, the unix code called
- * other_child_check only at restart.
- */
-APR_DECLARE(void) apr_proc_other_child_check(void)
-{
-#ifdef WIN32
- apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING);
-#else
- apr_proc_other_child_refresh_all(APR_OC_REASON_RESTART);
-#endif
-}
-
-/* XXX: deprecated for removal in 1.0
- * This really didn't test any sort of read - it simply notified
- * the maintenance function that the process had died.
- */
-APR_DECLARE(apr_status_t) apr_proc_other_child_read(apr_proc_t *proc, int status)
-{
- return apr_proc_other_child_alert(proc, APR_OC_REASON_DEATH, status);
-}
-