From c0845f1be75f82fb29cc3a15d26b819041e39813 Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Sun, 26 Nov 2006 22:10:38 +0100
Subject: [PATCH] some code simplifications.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
 keymap.c | 29 +++++++++--------------------
 keymap.h |  4 ----
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/keymap.c b/keymap.c
index 7be6869..3a2f922 100644
--- a/keymap.c
+++ b/keymap.c
@@ -90,21 +90,13 @@ static struct keymap_t *allocKeys(int len, keycode_t *keys)
 
 static int parse_fkey (const char *s)
 {
-  const char *t;
   int n = 0;
 
-  if (s[0] != '<' || ascii_tolower (s[1]) != 'f')
+  if (s[0] != '<' || ascii_tolower(s[1]) != 'f')
     return -1;
 
-  for (t = s + 2; *t && isdigit ((unsigned char) *t); t++) {
-    n *= 10;
-    n += *t - '0';
-  }
-
-  if (*t != '>')
-    return -1;
-  else
-    return n;
+  n = strtol(s + 2, (char **)&s, 10);
+  return *s == '>' ? n : -1;
 }
 
 /*
@@ -113,12 +105,12 @@ static int parse_fkey (const char *s)
  */
 static int parse_keycode (const char *s)
 {
-  if (isdigit ((unsigned char) s[1]) &&
-      isdigit ((unsigned char) s[2]) &&
-      isdigit ((unsigned char) s[3]) && s[4] == '>') {
-    return (s[3] - '0') + (s[2] - '0') * 8 + (s[1] - '0') * 64;
-  }
-  return -1;
+    int n;
+
+    if (*s != '<')
+        return -1;
+    n = strtol(s + 1, (char **)&s, 8);
+    return *s == '>' ? n : -1;
 }
 
 static int parsekeys (const char *str, keycode_t * d, int max)
@@ -510,8 +502,6 @@ void km_init (void)
   create_bindings (OpPost, MENU_POST);
   create_bindings (OpQuery, MENU_QUERY);
   create_bindings (OpAlias, MENU_ALIAS);
-
-
   create_bindings (OpPgp, MENU_PGP);
   create_bindings (OpSmime, MENU_SMIME);
 
@@ -733,7 +723,6 @@ struct binding_t *km_get_table (int menu)
     return OpEditor;
   case MENU_QUERY:
     return OpQuery;
-
   case MENU_PGP:
     return OpPgp;
 
diff --git a/keymap.h b/keymap.h
index 6ce0b5f..3065f01 100644
--- a/keymap.h
+++ b/keymap.h
@@ -54,8 +54,6 @@ enum {
   MENU_PAGER,
   MENU_POST,
   MENU_QUERY,
-
-
   MENU_PGP,
   MENU_SMIME,
 
@@ -68,8 +66,6 @@ enum {
   MENU_MIX,
 #endif
 
-
-
   MENU_MAX
 };
 
-- 
2.20.1