提交 f4464002 编写于 作者: P Peter Krempa

virsh-snapshot: Fix coding style and remove dead code

buffer won't be NULL in any case when reaching the check and the first
block of the if statement was lacking parentheses
上级 e7aa207c
......@@ -204,26 +204,17 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd)
if (vshCommandOptBool(cmd, "live"))
flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE;
dom = vshCommandOptDomain(ctl, cmd, NULL);
if (dom == NULL)
if (!(dom = vshCommandOptDomain(ctl, cmd, NULL)))
goto cleanup;
if (vshCommandOptString(cmd, "xmlfile", &from) <= 0)
if (vshCommandOptString(cmd, "xmlfile", &from) <= 0) {
buffer = vshStrdup(ctl, "<domainsnapshot/>");
else {
} else {
if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) {
/* we have to report the error here because during cleanup
* we'll run through virDomainFree(), which loses the
* last error
*/
vshReportError(ctl);
vshSaveLibvirtError();
goto cleanup;
}
}
if (buffer == NULL) {
vshError(ctl, "%s", _("Out of memory"));
goto cleanup;
}
ret = vshSnapshotCreate(ctl, dom, buffer, flags, from);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册