From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 18 Apr 2013 08:40:49 +0000 (+0200)
Subject: virsh-domain: Clean up cmdSendKey
X-Git-Tag: v1.0.5-rc1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35d0f3b14a26cc73c7bba104126cc131b35d5931;p=thirdparty%2Flibvirt.git

virsh-domain: Clean up cmdSendKey

Rename the get_integer_keycode helper to vshKeyCodeGetInt and get rid of
a unneeded typecast.
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 4d0cc8f818..02555426a1 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6725,7 +6725,7 @@ static const vshCmdOptDef opts_send_key[] = {
 };
 
 static int
-get_integer_keycode(const char *key_name)
+vshKeyCodeGetInt(const char *key_name)
 {
     unsigned int val;
 
@@ -6757,7 +6757,7 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd)
         holdtime = 0;
 
     codeset = virKeycodeSetTypeFromString(codeset_option);
-    if ((int)codeset < 0) {
+    if (codeset < 0) {
         vshError(ctl, _("unknown codeset: '%s'"), codeset_option);
         goto cleanup;
     }
@@ -6768,7 +6768,7 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd)
             goto cleanup;
         }
 
-        if ((keycode = get_integer_keycode(opt->data)) <= 0) {
+        if ((keycode = vshKeyCodeGetInt(opt->data)) <= 0) {
             if ((keycode = virKeycodeValueFromString(codeset, opt->data)) <= 0) {
                 vshError(ctl, _("invalid keycode: '%s'"), opt->data);
                 goto cleanup;