[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/15] qga: Consistently name Error ** objects errp,
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 03/15] qga: Consistently name Error ** objects errp, and not err |
Date: |
Fri, 25 Apr 2014 17:05:41 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
qga/commands-posix.c | 10 +++++-----
qga/commands-win32.c | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index e49c7da..f6af7d1 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -839,14 +839,14 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp)
static void guest_fsfreeze_cleanup(void)
{
- Error *errp = NULL;
+ Error *err = NULL;
if (ga_is_frozen(ga_state) == GUEST_FSFREEZE_STATUS_FROZEN) {
- qmp_guest_fsfreeze_thaw(&errp);
- if (errp) {
+ qmp_guest_fsfreeze_thaw(&err);
+ if (err) {
slog("failed to clean up frozen filesystems: %s",
- error_get_pretty(errp));
- error_free(errp);
+ error_get_pretty(err));
+ error_free(err);
}
}
}
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 7e7df73..d0d8504 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -227,18 +227,18 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp)
static void guest_fsfreeze_cleanup(void)
{
- Error *errp = NULL;
+ Error *err = NULL;
if (!vss_initialized()) {
return;
}
if (ga_is_frozen(ga_state) == GUEST_FSFREEZE_STATUS_FROZEN) {
- qmp_guest_fsfreeze_thaw(&errp);
- if (errp) {
+ qmp_guest_fsfreeze_thaw(&err);
+ if (err) {
slog("failed to clean up frozen filesystems: %s",
- error_get_pretty(errp));
- error_free(errp);
+ error_get_pretty(err));
+ error_free(err);
}
}
--
1.8.1.4
- [Qemu-devel] [PATCH 09/15] tests/qapi-schema: Drop superfluous error_is_set(), (continued)
- [Qemu-devel] [PATCH 09/15] tests/qapi-schema: Drop superfluous error_is_set(), Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 12/15] qga: Drop superfluous error_is_set(), Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 01/15] qmp hmp: Consistently name Error * objects err, and not errp, Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 13/15] qemu-option: Clean up fragile use of error_is_set(), Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 06/15] qga: Use return values instead of error_is_set(errp), Markus Armbruster, 2014/04/25
[Qemu-devel] [PATCH 04/15] qmp: Consistently name Error ** objects errp, and not err, Markus Armbruster, 2014/04/25
[Qemu-devel] [PATCH 03/15] qga: Consistently name Error ** objects errp, and not err,
Markus Armbruster <=
[Qemu-devel] [PATCH 15/15] qmp: Don't use error_is_set() to suppress additional errors, Markus Armbruster, 2014/04/25
Re: [Qemu-devel] [PATCH 00/15] qmp qga: Purge error_is_set(), Eric Blake, 2014/04/25