From e2f16ec20e1e47a76746fefc252a1f9c548b7766 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 16 Aug 2015 18:45:42 -0700
Subject: Define a constant for function-not-found in input.cpp

Avoids differences in widths of wchar_t, hopefully addressing
issue #2284
---
 src/input.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/input.cpp')

diff --git a/src/input.cpp b/src/input.cpp
index d8977be3..2b556c2a 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -557,7 +557,7 @@ static void input_mapping_execute(const input_mapping_t &m, bool allow_commands)
 
     for (wcstring_list_t::const_iterator it = m.commands.begin(), end = m.commands.end(); it != end; ++it)
     {
-        if (input_function_get_code(*it) != -1)
+        if (input_function_get_code(*it) != INPUT_CODE_NONE)
             has_functions = true;
         else
             has_commands = true;
@@ -1103,14 +1103,12 @@ wcstring_list_t input_function_get_names(void)
 
 wchar_t input_function_get_code(const wcstring &name)
 {
-
-    size_t i;
-    for (i = 0; i<(sizeof(code_arr)/sizeof(wchar_t)) ; i++)
+    for (size_t i=0; i < sizeof code_arr / sizeof *code_arr; i++)
     {
         if (name == name_arr[i])
         {
             return code_arr[i];
         }
     }
-    return -1;
+    return INPUT_CODE_NONE;
 }
-- 
cgit v1.2.3