diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-11-21 09:50:45 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2022-12-14 16:19:35 +0100 |
| commit | 6c37ebf3301ca449ebe449138b86e55762503250 (patch) | |
| tree | 1b0e28279ef42b2cce3936f961618c7dc627b0b7 /qga | |
| parent | 3d558330adec7233da6c48c5e8584eb176fb77d7 (diff) | |
error: Drop some obviously superfluous error_propagate()
When error_propagate(errp, local_err) is the only reader of
@local_err, we can just as well change its writers to write @errp
directly, and drop the error_propagate() along with @local_err.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221121085054.683122-2-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/commands-win32.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ec9f55b453..962db8e543 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -275,13 +275,12 @@ static void acquire_privilege(const char *name, Error **errp) { HANDLE token = NULL; TOKEN_PRIVILEGES priv; - Error *local_err = NULL; if (OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token)) { if (!LookupPrivilegeValue(NULL, name, &priv.Privileges[0].Luid)) { - error_setg(&local_err, QERR_QGA_COMMAND_FAILED, + error_setg(errp, QERR_QGA_COMMAND_FAILED, "no luid for requested privilege"); goto out; } @@ -290,13 +289,13 @@ static void acquire_privilege(const char *name, Error **errp) priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; if (!AdjustTokenPrivileges(token, FALSE, &priv, 0, NULL, 0)) { - error_setg(&local_err, QERR_QGA_COMMAND_FAILED, + error_setg(errp, QERR_QGA_COMMAND_FAILED, "unable to acquire requested privilege"); goto out; } } else { - error_setg(&local_err, QERR_QGA_COMMAND_FAILED, + error_setg(errp, QERR_QGA_COMMAND_FAILED, "failed to open privilege token"); } @@ -304,7 +303,6 @@ out: if (token) { CloseHandle(token); } - error_propagate(errp, local_err); } static void execute_async(DWORD WINAPI (*func)(LPVOID), LPVOID opaque, |