From: Benno Schulenberg Date: Mon, 14 Apr 2014 10:03:32 +0000 (+0000) Subject: Eliding a variable and condensing a comment. X-Git-Tag: v2.3.3~160 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1e3f6bc00b1d3693aea5b3699ec3b3acb07f8d1d;p=nano.git Eliding a variable and condensing a comment. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4770 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index cd831402..e1fca29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * src/*: Remove the unused parameter 'func_key' from get_shortcut(), and subsequently from parse_browser_input() and parse_help_input(). * src/*: Whitespace adjustments, plus a few comment tweaks. + * src/winio.c (getfuncfromkey): Elide variable and condense comment. 2014-04-13 Benno Schulenberg * proto.h, global.c, rcfile.c: Remove the unused parameter 'menu' diff --git a/src/winio.c b/src/winio.c index a4f8d4ea..7c5f6fb8 100644 --- a/src/winio.c +++ b/src/winio.c @@ -1793,15 +1793,12 @@ const sc *get_shortcut(int menu, int *kbinput, bool *meta_key) return NULL; } -/* Try to get a function back from a window. Just a wrapper - * functions need to create a function_key meta_key blah blah - * menu - what menu name to look through for valid funcs. */ +/* Try to get a function back from a window. Just a wrapper. */ const subnfunc *getfuncfromkey(WINDOW *win) { int kbinput; bool func_key = FALSE, meta_key = FALSE; const sc *s; - const subnfunc *f; kbinput = parse_kbinput(win, &meta_key, &func_key); if (kbinput == 0) @@ -1811,9 +1808,7 @@ const subnfunc *getfuncfromkey(WINDOW *win) if (!s) return NULL; - f = sctofunc((sc *) s); - return f; - + return sctofunc((sc *) s); } /* Move to (x, y) in win, and display a line of n spaces with the