From 2c5495f7b60d6ddcd6a411b48d2f6dbc4a24717a Mon Sep 17 00:00:00 2001 From: Rohit Mani Date: Fri, 7 Mar 2014 22:48:31 -0800 Subject: use strchrnul() in place of strchr() and strlen() Avoid scanning strings twice, once with strchr() and then with strlen(), by using strchrnul(). Helped-by: Junio C Hamano Signed-off-by: Rohit Mani Signed-off-by: Junio C Hamano --- diff.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 8e4a6a9105..015895bba6 100644 --- a/diff.c +++ b/diff.c @@ -3365,14 +3365,11 @@ static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *va if (c != '-') return 0; arg++; - eq = strchr(arg, '='); - if (eq) - len = eq - arg; - else - len = strlen(arg); + eq = strchrnul(arg, '='); + len = eq - arg; if (!len || strncmp(arg, arg_long, len)) return 0; - if (eq) { + if (*eq) { int n; char *end; if (!isdigit(*++eq)) -- cgit v1.2.3