提交 acd981e3 编写于 作者: J Jim Meyering

maint: more VIR_WARN corrections: now manually

* 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.
上级 3f76a993
...@@ -76,14 +76,12 @@ src/util/hooks.c ...@@ -76,14 +76,12 @@ src/util/hooks.c
src/util/hostusb.c src/util/hostusb.c
src/util/interface.c src/util/interface.c
src/util/json.c src/util/json.c
src/util/logging.c
src/util/macvtap.c src/util/macvtap.c
src/util/pci.c src/util/pci.c
src/util/processinfo.c src/util/processinfo.c
src/util/stats_linux.c src/util/stats_linux.c
src/util/storage_file.c src/util/storage_file.c
src/util/util.c src/util/util.c
src/util/uuid.c
src/util/virterror.c src/util/virterror.c
src/util/xml.c src/util/xml.c
src/vbox/vbox_driver.c src/vbox/vbox_driver.c
......
...@@ -1798,15 +1798,13 @@ phypUUIDTable_ReadFile(virConnectPtr conn) ...@@ -1798,15 +1798,13 @@ phypUUIDTable_ReadFile(virConnectPtr conn)
} }
uuid_table->lpars[i]->id = id; uuid_table->lpars[i]->id = id;
} else { } else {
VIR_WARN("%s", VIR_WARN0("Unable to read from information to local file.");
"Unable to read from information to local file.");
goto err; goto err;
} }
rc = read(fd, uuid_table->lpars[i]->uuid, VIR_UUID_BUFLEN); rc = read(fd, uuid_table->lpars[i]->uuid, VIR_UUID_BUFLEN);
if (rc != VIR_UUID_BUFLEN) { if (rc != VIR_UUID_BUFLEN) {
VIR_WARN("%s", VIR_WARN0("Unable to read information to local file.");
"Unable to read information to local file.");
goto err; goto err;
} }
} }
...@@ -1909,8 +1907,7 @@ phypUUIDTable_Init(virConnectPtr conn) ...@@ -1909,8 +1907,7 @@ phypUUIDTable_Init(virConnectPtr conn)
uuid_table->lpars[i]->id = ids[i]; uuid_table->lpars[i]->id = ids[i];
if (virUUIDGenerate(uuid_table->lpars[i]->uuid) < 0) if (virUUIDGenerate(uuid_table->lpars[i]->uuid) < 0)
VIR_WARN("%s %d", "Unable to generate UUID for domain", VIR_WARN("Unable to generate UUID for domain %d", ids[i]);
ids[i]);
} }
} else { } else {
virReportOOMError(); virReportOOMError();
...@@ -2083,8 +2080,7 @@ phypUUIDTable_Pull(virConnectPtr conn) ...@@ -2083,8 +2080,7 @@ phypUUIDTable_Pull(virConnectPtr conn)
rc = libssh2_channel_read(channel, buffer, amount); rc = libssh2_channel_read(channel, buffer, amount);
if (rc > 0) { if (rc > 0) {
if (safewrite(fd, buffer, rc) != rc) if (safewrite(fd, buffer, rc) != rc)
VIR_WARN("%s", VIR_WARN0("Unable to write information to local file.");
"Unable to write information to local file.");
got += rc; got += rc;
total += rc; total += rc;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册