From 46e92e1e568021ecdfa30bfea0efabe72b85633b Mon Sep 17 00:00:00 2001
From: Denys Vlasenko
Date: Mon, 3 Apr 2023 17:30:03 +0200
Subject: ash: code shrink: do not take address of prefix(), allowing it to
 inline

function                                             old     new   delta
getjob                                               281     285      +4
prefix                                                13       -     -13
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 1/0 up/down: 4/-13)              Total: -9 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 shell/ash.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'shell')

diff --git a/shell/ash.c b/shell/ash.c
index cb674e6..d4ee4c9 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -3962,7 +3962,6 @@ getjob(const char *name, int getctl)
 	unsigned num;
 	int c;
 	const char *p;
-	char *(*match)(const char *, const char *);
 
 	jp = curjob;
 	p = name;
@@ -4003,15 +4002,12 @@ getjob(const char *name, int getctl)
 		}
 	}
 
-	match = prefix;
-	if (*p == '?') {
-		match = strstr;
-		p++;
-	}
-
 	found = NULL;
 	while (jp) {
-		if (match(jp->ps[0].ps_cmd, p)) {
+		if (*p == '?'
+		 ? strstr(jp->ps[0].ps_cmd, p + 1)
+		 : prefix(jp->ps[0].ps_cmd, p)
+		) {
 			if (found)
 				goto err;
 			found = jp;
-- 
cgit v1.1