From c6f420b53d3a1639920a332fd8db335a90831149 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Fri, 10 Nov 2017 17:12:09 +1100 Subject: [PATCH] Simplify get_window_by_desc() The '#' case never worked anyway, so just remove it and simplify. --- source/window.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/source/window.c b/source/window.c index a985f6b..e554a8a 100644 --- a/source/window.c +++ b/source/window.c @@ -1175,21 +1175,13 @@ char *BX_get_status_by_refnum(unsigned refnum, unsigned line) /* * get_window_by_desc: Given either a refnum or a name, find that window */ -Window *BX_get_window_by_desc (const char *stuff) +Window *BX_get_window_by_desc(const char *desc) { -Window *w = NULL; - do - { - if ((w = get_window_by_name(stuff))) - break; - if (is_number(stuff) && (w = get_window_by_refnum(my_atol(stuff)))) - break; - if (*stuff == '#') - { - stuff++; - continue; - } - } while (0); + Window *w = get_window_by_name(desc); + + if (!w && is_number(desc)) + w = get_window_by_refnum(my_atol(desc)); + return w; }