[前][次][番号順一覧][スレッド一覧]

ruby-changes:44237

From: usa <ko1@a...>
Date: Sat, 1 Oct 2016 02:03:52 +0900 (JST)
Subject: [ruby-changes:44237] usa:r56310 (trunk): * win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets

usa	2016-10-01 02:03:48 +0900 (Sat, 01 Oct 2016)

  New Revision: 56310

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56310

  Log:
    * win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
      errno internally, then should not set it here.

  Modified files:
    trunk/ChangeLog
    trunk/win32/win32.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 56309)
+++ ChangeLog	(revision 56310)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Oct  1 02:02:02 2016  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
+	  errno internally, then should not set it here.
+
 Fri Sep 30 19:06:21 2016  Anton Davydov  <mail@d...>
 
 	* lib/uri/http.rb: Documentation and code style imrovements.
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 56309)
+++ win32/win32.c	(revision 56310)
@@ -4345,7 +4345,6 @@ poll_child_status(struct ChildRecord *ch https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L4345
 
     if (!GetExitCodeProcess(child->hProcess, &exitcode)) {
 	/* If an error occurred, return immediately. */
-    error_exit:
 	err = GetLastError();
 	switch (err) {
 	  case ERROR_INVALID_PARAMETER:
@@ -4358,6 +4357,7 @@ poll_child_status(struct ChildRecord *ch https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L4357
 	    errno = map_errno(err);
 	    break;
 	}
+    error_exit:
 	CloseChildHandle(child);
 	return -1;
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]