NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Move error messages inside vshCommandOpt*() functions

Browse Source
This commit is contained in:
Andrea Bolognani
2015-06-02 11:17:29 +02:00
committed by John Ferlan
parent be6ff4da95
commit 815dc963ee
9 changed files with 124 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/virsh-volume.c
View File

@@ -693,19 +693,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd)
const char *name = NULL;
unsigned long long offset = 0, length = 0;
if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) {
vshError(ctl,
_("Numeric value for <%s> option is malformed or out of range"),
"offset");
if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0)
return false;
}
if (vshCommandOptULongLongWrap(ctl, cmd, "length", &length) < 0) {
vshError(ctl,
_("Numeric value for <%s> option is malformed or out of range"),
"length");
if (vshCommandOptULongLongWrap(ctl, cmd, "length", &length) < 0)
return false;
}
if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name)))
return false;
@@ -806,19 +798,11 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd)
unsigned long long offset = 0, length = 0;
bool created = false;
if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) {
vshError(ctl,
_("Numeric value for <%s> option is malformed or out of range"),
"offset");
if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0)
return false;
}
if (vshCommandOptULongLongWrap(ctl, cmd, "length", &length) < 0) {
vshError(ctl,
_("Numeric value for <%s> option is malformed or out of range"),
"length");
if (vshCommandOptULongLongWrap(ctl, cmd, "length", &length) < 0)
return false;
}
if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name)))
return false;