From stdcxx-commits-return-906-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org Mon Aug 21 17:37:35 2006 Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 18619 invoked from network); 21 Aug 2006 17:37:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Aug 2006 17:37:32 -0000 Received: (qmail 57378 invoked by uid 500); 21 Aug 2006 17:37:23 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 57355 invoked by uid 500); 21 Aug 2006 17:37:23 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 57270 invoked by uid 99); 21 Aug 2006 17:37:23 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2006 10:37:22 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2006 10:37:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 14C721A981A; Mon, 21 Aug 2006 10:37:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r433300 - /incubator/stdcxx/trunk/util/exec.cpp Date: Mon, 21 Aug 2006 17:37:01 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060821173702.14C721A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sebor Date: Mon Aug 21 10:37:01 2006 New Revision: 433300 URL: http://svn.apache.org/viewvc?rev=433300&view=rev Log: 2006-08-21 Farid Zaripov * exec.cpp [_WIN32 || _WIN64] (exec_file): WAIT_FAIL replaced with WAIT_FAILED; fixed incorrect parameter in calls CloseHandle and WaitForSingleObject. Modified: incubator/stdcxx/trunk/util/exec.cpp Modified: incubator/stdcxx/trunk/util/exec.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/util/exec.cpp?rev=433300&r1=433299&r2=433300&view=diff ============================================================================== --- incubator/stdcxx/trunk/util/exec.cpp (original) +++ incubator/stdcxx/trunk/util/exec.cpp Mon Aug 21 10:37:01 2006 @@ -952,7 +952,7 @@ if (-1 == status.status) return status; - if (0 == CloseHandle (context.hThread)) + if (0 == CloseHandle (child.hThread)) warn_last_error ("Closing child main thread handle"); /* Wait for the child process to terminate */ @@ -970,7 +970,7 @@ status.error = warn_last_error ("Waiting for child process"); } - if (0 == CloseHandle (context.hProcess)) + if (0 == CloseHandle (child.hProcess)) warn_last_error ("Closing child process handle"); return status; } @@ -1012,7 +1012,7 @@ status.error = warn_last_error ("Waiting for child process"); } - if (0 == CloseHandle (context.hProcess)) + if (0 == CloseHandle (child.hProcess)) warn_last_error ("Closing child process handle"); return status; } @@ -1020,7 +1020,7 @@ /* Then hard kill the child process */ if (0 == TerminateProcess (child.hProcess, 3)) warn_last_error ("Terminating child process"); - else if (WAIT_FAIL == WaitForSingleObject (child.hProcess, 1000)) + else if (WAIT_FAILED == WaitForSingleObject (child.hProcess, 1000)) warn_last_error ("Waiting for child process"); if (0 == GetExitCodeProcess (child.hProcess, &status.status)) { @@ -1028,7 +1028,7 @@ status.status = -1; } status.error = 3; - if (0 == CloseHandle (context.hProcess)) + if (0 == CloseHandle (child.hProcess)) warn_last_error ("Closing child process handle"); return status; }