[libvirt] [PATCH 5/5] maint: more VIR_WARN corrections: now manually
From: Jim Meyering <meyering(a)redhat.com>
* po/POTFILES.in: Remove src/util/logging.c and src/util/uuid.c.
* src/phyp/phyp_driver.c (phypUUIDTable_ReadFile): Correct more
VIR_WARN uses, now manually.
(phypUUIDTable_Init, phypUUIDTable_Pull): Likewise.
---
po/POTFILES.in | 2 --
src/phyp/phyp_driver.c | 12 ++++--------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88218bd..e08b8c8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -76,14 +76,12 @@ src/util/hooks.c
src/util/hostusb.c
src/util/interface.c
src/util/json.c
-src/util/logging.c
src/util/macvtap.c
src/util/pci.c
src/util/processinfo.c
src/util/stats_linux.c
src/util/storage_file.c
src/util/util.c
-src/util/uuid.c
src/util/virterror.c
src/util/xml.c
src/vbox/vbox_driver.c
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index b174fc9..8f4f310 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -1798,15 +1798,13 @@ phypUUIDTable_ReadFile(virConnectPtr conn)
}
uuid_table->lpars[i]->id = id;
} else {
- VIR_WARN("%s",
- "Unable to read from information to local file.");
+ VIR_WARN0("Unable to read from information to local file.");
goto err;
}
rc = read(fd, uuid_table->lpars[i]->uuid, VIR_UUID_BUFLEN);
if (rc != VIR_UUID_BUFLEN) {
- VIR_WARN("%s",
- "Unable to read information to local file.");
+ VIR_WARN0("Unable to read information to local file.");
goto err;
}
}
@@ -1909,8 +1907,7 @@ phypUUIDTable_Init(virConnectPtr conn)
uuid_table->lpars[i]->id = ids[i];
if (virUUIDGenerate(uuid_table->lpars[i]->uuid) < 0)
- VIR_WARN("%s %d", "Unable to generate UUID for
domain",
- ids[i]);
+ VIR_WARN("Unable to generate UUID for domain %d", ids[i]);
}
} else {
virReportOOMError();
@@ -2083,8 +2080,7 @@ phypUUIDTable_Pull(virConnectPtr conn)
rc = libssh2_channel_read(channel, buffer, amount);
if (rc > 0) {
if (safewrite(fd, buffer, rc) != rc)
- VIR_WARN("%s",
- "Unable to write information to local file.");
+ VIR_WARN0("Unable to write information to local file.");
got += rc;
total += rc;
--
1.7.1.259.g3aef8