From: Anders Waldenborg <anders@0x63.nu>
Date: Mon, 28 Jan 2019 21:33:33 +0000 (+0100)
Subject: pretty: single return path in %(trailers) handling
X-Git-Tag: v2.22.0-rc0~179^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e3f34781964c225ca199ac50527f3ce6feddb84;p=thirdparty%2Fgit.git

pretty: single return path in %(trailers) handling

No functional change intended.

This change may not seem useful on its own, but upcoming commits will do
memory allocation in there, and a single return path makes deallocation
easier.

Signed-off-by: Anders Waldenborg <anders@0x63.nu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/pretty.c b/pretty.c
index 4dfbd38cf6..610837e439 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1353,6 +1353,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 
 	if (skip_prefix(placeholder, "(trailers", &arg)) {
 		struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+		size_t ret = 0;
 
 		opts.no_divider = 1;
 
@@ -1366,8 +1367,9 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		}
 		if (*arg == ')') {
 			format_trailers_from_commit(sb, msg + c->subject_off, &opts);
-			return arg - placeholder + 1;
+			ret = arg - placeholder + 1;
 		}
+		return ret;
 	}
 
 	return 0;	/* unknown placeholder */