Commit 9f86ec52fab7e7eeb9ee95087c08fc88185d5ff3

Vicent Marti 2011-07-05T02:28:18

signature: Fix warnings Add extra braces to avoid ambiguous if-else. Also, free() doesn't need a check.

diff --git a/src/signature.c b/src/signature.c
index bc88a76..6d4860b 100644
--- a/src/signature.c
+++ b/src/signature.c
@@ -33,12 +33,8 @@ void git_signature_free(git_signature *sig)
 	if (sig == NULL)
 		return;
 
-	if (sig->name)
-		free(sig->name);
-
-	if (sig->email)
-		free(sig->email);
-
+	free(sig->name);
+	free(sig->email);
 	free(sig);
 }
 
@@ -66,11 +62,12 @@ static int process_trimming(const char *input, char **storage, const char *input
 	left = skip_leading_spaces(input, input_end);
 	right = skip_trailing_spaces(input, input_end - 1);
 
-	if (right <= left)
+	if (right <= left) {
 		if (fail_when_empty)
 			return git__throw(GIT_EINVALIDARGS, "Failed to trim. Input is either empty or only contains spaces");
 		else
 			right = left - 1;
+	}
 
 	trimmed_input_length = right - left + 1;