Corrected erroneous interpretation of keycodes as command ids in variable names ...

[plomrogue] / src / client / control.c

diff --git a/src/client/control.c b/src/client/control.c
index 20f1fcf9ceccf177148e20d417d88c8593969ccc..64486e30eb9a808ad1fa951309a1c8edb3b1c938 100644 (file)
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -23,13 +23,13 @@
 
 
 
-/* If "command_id" matches "match" in get_available_keycode_to_command(),
- * execute "f" with provided char arguments and return 1; else only return 0.
+/* If "keycode" matches "match" in get_available_keycode_to_command(), execute
+ * "f" with provided char arguments and return 1; else only return 0.
  */
-static uint8_t try_cmd_0args(int command_id, char * match, void (* f) ());
-static uint8_t try_cmd_1args(int command_id, char * match,
+static uint8_t try_cmd_0args(int keycode, char * match, void (* f) ());
+static uint8_t try_cmd_1args(int keycode, char * match,
                              void (* f) (char), char c);
-static uint8_t try_cmd_2args(int command_id, char * match,
+static uint8_t try_cmd_2args(int keycode, char * match,
                              void (* f) (char, char), char c1, char c2);
 
 /* If "command_id" is id of command named "match", send (via try_send()) a
@@ -52,9 +52,9 @@ static void wrap_mv_kb_mod(char c1, char c2);
 
 
 
-static uint8_t try_cmd_0args(int command_id, char * match, void (* f) ())
+static uint8_t try_cmd_0args(int keycode, char * match, void (* f) ())
 {
-    if (command_id == get_available_keycode_to_command(match))
+    if (keycode == get_available_keycode_to_command(match))
     {
         f();
         return 1;
@@ -64,10 +64,10 @@ static uint8_t try_cmd_0args(int command_id, char * match, void (* f) ())
 
 
 
-static uint8_t try_cmd_1args(int command_id, char * match,
+static uint8_t try_cmd_1args(int keycode, char * match,
                              void (* f) (char), char c)
 {
-    if (command_id == get_available_keycode_to_command(match))
+    if (keycode == get_available_keycode_to_command(match))
     {
         f(c);
         return 1;
@@ -77,10 +77,10 @@ static uint8_t try_cmd_1args(int command_id, char * match,
 
 
 
-static uint8_t try_cmd_2args(int command_id, char * match,
+static uint8_t try_cmd_2args(int keycode, char * match,
                              void (* f) (char, char), char c1, char c2)
 {
-    if (command_id == get_available_keycode_to_command(match))
+    if (keycode == get_available_keycode_to_command(match))
     {
         f(c1, c2);
         return 1;