[PATCH 1/6] diff.c: remove useless check for value != NULL

[PATCH 1/6] diff.c: remove useless check for value != NULL

[Christian Couder]

It is not necessary to check if value != NULL before calling
'parse_lldiff_command' as there is already a check inside this
function.

By the way this patch also improves the existing check inside
'parse_lldiff_command' by using:
	return config_error_nonbool(var);
instead of:
	return error("%s: lacks value", var);

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 diff.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

	This patch series can be applied on "master"
	on top of my "diff.c: strdup -> xstrdup" patch. 

	The first 3 patches apply cleanly on "next" though.

diff --git a/diff.c b/diff.c
index e5db293..5640cbf 100644
--- a/diff.c
+++ b/diff.c
@@ -87,7 +87,7 @@ static int parse_lldiff_command(const char *var, const char *ep, const char *val
 	}
 
 	if (!value)
-		return error("%s: lacks value", var);
+		return config_error_nonbool(var);
 	drv->cmd = xstrdup(value);
 	return 0;
 }
@@ -166,13 +166,8 @@ int git_diff_ui_config(const char *var, const char *value)
 	if (!prefixcmp(var, "diff.")) {
 		const char *ep = strrchr(var, '.');
 
-		if (ep != var + 4) {
-			if (!strcmp(ep, ".command")) {
-				if (!value)
-					return config_error_nonbool(var);
-				return parse_lldiff_command(var, ep, value);
-			}
-		}
+		if (ep != var + 4 && !strcmp(ep, ".command"))
+			return parse_lldiff_command(var, ep, value);
 	}
 
 	return git_diff_basic_config(var, value);
-- 
1.5.4.1.129.gf12af-dirty

Re: [PATCH 1/6] diff.c: remove useless check for value != NULL

[Junio C Hamano]

Christian Couder <chriscool@tuxfamily.org> writes:

> 	This patch series can be applied on "master"
> 	on top of my "diff.c: strdup -> xstrdup" patch. 
>
> 	The first 3 patches apply cleanly on "next" though.

They are all 'maint' material as far as I can tell ;-)

Thanks.