From 206b28ca15d11c0cb6f99553dbe8d891395e46e2 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 19 Jun 2013 18:08:30 +0000 Subject: win32.c: GetLastError once * win32/win32.c (poll_child_status): call GetLastError() once. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'win32/win32.c') diff --git a/win32/win32.c b/win32/win32.c index 0290b89825..a6ce3120db 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4033,13 +4033,16 @@ poll_child_status(struct ChildRecord *child, int *stat_loc) /* If an error occurred, return immediately. */ error_exit: err = GetLastError(); - if (err == ERROR_INVALID_PARAMETER) + switch (err) { + case ERROR_INVALID_PARAMETER: errno = ECHILD; - else { - if (GetLastError() == ERROR_INVALID_HANDLE) - errno = EINVAL; - else - errno = map_errno(GetLastError()); + break; + case ERROR_INVALID_HANDLE: + errno = EINVAL; + break; + default: + errno = map_errno(err); + break; } CloseChildHandle(child); return -1; -- cgit v1.2.3