diff mbox

[v2,12/15] qga: Drop superfluous error_is_set()

Message ID 1398716874-18699-13-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster April 28, 2014, 8:27 p.m. UTC 
acquire_privilege(), execute_async() and check_suspend_mode() do
nothing when called with an error set.  Callers shouldn't do that, and
no caller does.  Drop the superfluous tests.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
 qga/commands-win32.c | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Michael Roth April 29, 2014, 9:47 p.m. UTC | #1 
Quoting Markus Armbruster (2014-04-28 15:27:51)
> acquire_privilege(), execute_async() and check_suspend_mode() do
> nothing when called with an error set.  Callers shouldn't do that, and
> no caller does.  Drop the superfluous tests.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

> ---
>  qga/commands-win32.c | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 3483c0d..d793dd0 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -35,10 +35,6 @@ static void acquire_privilege(const char *name, Error **errp)
>      TOKEN_PRIVILEGES priv;
>      Error *local_err = NULL;
> 
> -    if (error_is_set(errp)) {
> -        return;
> -    }
> -
>      if (OpenProcessToken(GetCurrentProcess(),
>          TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &token))
>      {
> @@ -74,9 +70,6 @@ static void execute_async(DWORD WINAPI (*func)(LPVOID), LPVOID opaque,
>  {
>      Error *local_err = NULL;
> 
> -    if (error_is_set(errp)) {
> -        return;
> -    }
>      HANDLE thread = CreateThread(NULL, 0, func, opaque, 0, NULL);
>      if (!thread) {
>          error_set(&local_err, QERR_QGA_COMMAND_FAILED,
> @@ -268,9 +261,6 @@ static void check_suspend_mode(GuestSuspendMode mode, Error **errp)
>      SYSTEM_POWER_CAPABILITIES sys_pwr_caps;
>      Error *local_err = NULL;
> 
> -    if (error_is_set(errp)) {
> -        return;
> -    }
>      ZeroMemory(&sys_pwr_caps, sizeof(sys_pwr_caps));
>      if (!GetPwrCapabilities(&sys_pwr_caps)) {
>          error_set(&local_err, QERR_QGA_COMMAND_FAILED,
> -- 
> 1.8.1.4
diff mbox

Patch

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 3483c0d..d793dd0 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -35,10 +35,6 @@  static void acquire_privilege(const char *name, Error **errp)
     TOKEN_PRIVILEGES priv;
     Error *local_err = NULL;
 
-    if (error_is_set(errp)) {
-        return;
-    }
-
     if (OpenProcessToken(GetCurrentProcess(),
         TOKEN_ADJUST_PRIVILEGES|TOKEN_QUERY, &token))
     {
@@ -74,9 +70,6 @@  static void execute_async(DWORD WINAPI (*func)(LPVOID), LPVOID opaque,
 {
     Error *local_err = NULL;
 
-    if (error_is_set(errp)) {
-        return;
-    }
     HANDLE thread = CreateThread(NULL, 0, func, opaque, 0, NULL);
     if (!thread) {
         error_set(&local_err, QERR_QGA_COMMAND_FAILED,
@@ -268,9 +261,6 @@  static void check_suspend_mode(GuestSuspendMode mode, Error **errp)
     SYSTEM_POWER_CAPABILITIES sys_pwr_caps;
     Error *local_err = NULL;
 
-    if (error_is_set(errp)) {
-        return;
-    }
     ZeroMemory(&sys_pwr_caps, sizeof(sys_pwr_caps));
     if (!GetPwrCapabilities(&sys_pwr_caps)) {
         error_set(&local_err, QERR_QGA_COMMAND_FAILED,