svn commit: r1443992 - /subversion/trunk/subversion/libsvn_subr/prompt.c

[rh...@apache.org]

Author: rhuijben
Date: Fri Feb  8 12:50:06 2013
New Revision: 1443992

URL: http://svn.apache.org/r1443992
Log:
* subversion/libsvn_subr/prompt.c
  (terminal_close): Remove some unneeded code. Replacing the child handler
    immediately before removing both handlers is unneeded.

Modified:
    subversion/trunk/subversion/libsvn_subr/prompt.c

Modified: subversion/trunk/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/prompt.c?rev=1443992&r1=1443991&r2=1443992&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/prompt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/prompt.c Fri Feb  8 12:50:06 2013
@@ -137,11 +137,7 @@ terminal_close(terminal_handle_t *termin
 {
   apr_status_t status;
 
-  /* Can't use apr_pool_cleanup_kill to remove the child cleanup; so
-     instead, replace it with the no-op handler. */
-  apr_pool_child_cleanup_set(terminal->pool, terminal,
-                             terminal_plain_cleanup,
-                             apr_pool_cleanup_null);
+  /* Can't use apr_pool_cleanup_kill removes both normal and child cleanup */
   apr_pool_cleanup_kill(terminal->pool, terminal, terminal_plain_cleanup);
 
   status = terminal_cleanup_handler(terminal, TRUE, TRUE);