[PATCH 3/3] batch: don't require checking retvalue for virBitmapGetBit
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
src/qemu/qemu_migration_cookie.c | 4 ++--
src/qemu/qemu_migration_params.c | 10 +++++-----
src/util/virbitmap.h | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index 6eaa704..2c95c31 100644
--- a/src/qemu/qemu_migration_cookie.c
+++ b/src/qemu/qemu_migration_cookie.c
@@ -756,8 +756,8 @@ qemuMigrationCookieCapsXMLFormat(virBufferPtr buf,
bool supported = false;
bool automatic = false;
- ignore_value(virBitmapGetBit(caps->supported, cap, &supported));
- ignore_value(virBitmapGetBit(caps->automatic, cap, &automatic));
+ virBitmapGetBit(caps->supported, cap, &supported);
+ virBitmapGetBit(caps->automatic, cap, &automatic);
if (supported) {
virBufferAsprintf(buf, "<cap name='%s'
auto='%s'/>\n",
qemuMigrationCapabilityTypeToString(cap),
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 100fcdf..572c4b1 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -786,11 +786,11 @@ qemuMigrationCapsToJSON(virBitmapPtr caps,
bool supported = false;
bool state = false;
- ignore_value(virBitmapGetBit(caps, bit, &supported));
+ virBitmapGetBit(caps, bit, &supported);
if (!supported)
continue;
- ignore_value(virBitmapGetBit(states, bit, &state));
+ virBitmapGetBit(states, bit, &state);
cap = virJSONValueNewObject();
@@ -1164,7 +1164,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver,
for (cap = 0; cap < QEMU_MIGRATION_CAP_LAST; cap++) {
bool state = false;
- ignore_value(virBitmapGetBit(migParams->caps, cap, &state));
+ virBitmapGetBit(migParams->caps, cap, &state);
if (state && !qemuMigrationCapsGet(vm, cap)) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
@@ -1183,7 +1183,7 @@ qemuMigrationParamsCheck(virQEMUDriverPtr driver,
bool remote = false;
if (remoteCaps)
- ignore_value(virBitmapGetBit(remoteCaps, cap, &remote));
+ virBitmapGetBit(remoteCaps, cap, &remote);
if (!remote) {
VIR_DEBUG("Not enabling migration capability '%s'; it is
"
@@ -1473,7 +1473,7 @@ qemuMigrationCapsGet(virDomainObjPtr vm,
bool enabled = false;
if (priv->migrationCaps)
- ignore_value(virBitmapGetBit(priv->migrationCaps, cap, &enabled));
+ virBitmapGetBit(priv->migrationCaps, cap, &enabled);
return enabled;
}
diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h
index af7ed53..c0b95ad 100644
--- a/src/util/virbitmap.h
+++ b/src/util/virbitmap.h
@@ -75,7 +75,7 @@ bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b)
* Get setting of bit position @b in @bitmap and store in @result
*/
int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result)
- ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT;
+ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3);
virBitmapPtr
virBitmapNewString(const char *string)
--
1.8.3.1