[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCHv2] virsh: fix keepalive error msg, man page update



resolves https://bugzilla.redhat.com/show_bug.cgi?id=1132305
---
 tools/virsh.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c
index 30a84c1..713c9a5 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -3470,18 +3470,32 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
             exit(EXIT_SUCCESS);
             break;
         case 'k':
-            if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0 ||
-                keepalive < 0) {
-                vshError(ctl, _("option %s requires a positive numeric argument"),
+            if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0) {
+                vshError(ctl,
+                         _("Invalid value for option %s"),
+                         longindex == -1 ? "-k" : "--keepalive-interval");
+                exit(EXIT_FAILURE);
+            }
+
+            if (keepalive < 0) {
+                vshError(ctl,
+                         _("option %s requires a positive integer argument"),
                          longindex == -1 ? "-k" : "--keepalive-interval");
                 exit(EXIT_FAILURE);
             }
             ctl->keepalive_interval = keepalive;
             break;
         case 'K':
-            if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0 ||
-                keepalive < 0) {
-                vshError(ctl, _("option %s requires a positive numeric argument"),
+            if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0) {
+                vshError(ctl,
+                         _("Invalid value for option %s"),
+                         longindex == -1 ? "-K" : "--keepalive-count");
+                exit(EXIT_FAILURE);
+            }
+
+            if (keepalive < 0) {
+                vshError(ctl,
+                         _("option %s requires a positive integer argument"),
                          longindex == -1 ? "-K" : "--keepalive-count");
                 exit(EXIT_FAILURE);
             }
-- 
1.9.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]