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

9
tools/virsh-domain-monitor.c
View File

@@ -340,12 +340,8 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd)
/* Providing a period will adjust the balloon driver collection period.
* This is not really an unsigned long, but it
*/
if ((rv = vshCommandOptInt(ctl, cmd, "period", &period)) < 0) {
vshError(ctl,
_("Numeric value for <%s> option is malformed or out of range"),
"period");
if ((rv = vshCommandOptInt(ctl, cmd, "period", &period)) < 0)
goto cleanup;
}
if (rv > 0) {
if (period < 0) {
vshError(ctl, _("Invalid collection period value '%d'"), period);
@@ -1440,9 +1436,6 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd)
if (rv < 0) {
/* invalid integer format */
vshError(ctl,
_("Numeric value for <%s> option is malformed or out of range"),
"time");
goto cleanup;
} else if (rv > 0) {
/* valid integer to set */