[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/15] qga: Consistently name Error ** objects er
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 03/15] qga: Consistently name Error ** objects errp, and not err |
Date: |
Mon, 28 Apr 2014 22:27:42 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <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 v2 00/15] qmp qga: Purge error_is_set(), Markus Armbruster, 2014/04/28
- [Qemu-devel] [PATCH v2 04/15] qmp: Consistently name Error ** objects errp, and not err, Markus Armbruster, 2014/04/28
- [Qemu-devel] [PATCH v2 03/15] qga: Consistently name Error ** objects errp, and not err,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 01/15] qmp hmp: Consistently name Error * objects err, and not errp, Markus Armbruster, 2014/04/28
- [Qemu-devel] [PATCH v2 02/15] qga: Consistently name Error ** objects errp, and not err, Markus Armbruster, 2014/04/28
- [Qemu-devel] [PATCH v2 05/15] error: Consistently name Error ** objects errp, and not err, Markus Armbruster, 2014/04/28
- [Qemu-devel] [PATCH v2 08/15] qapi: Drop redundant, unclean error_is_set(), Markus Armbruster, 2014/04/28
- [Qemu-devel] [PATCH v2 13/15] qemu-option: Clean up fragile use of error_is_set(), Markus Armbruster, 2014/04/28