git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Lukas Fleischer <git@cryptocrack.de>, git@vger.kernel.org
Subject: [PATCH 3/5] builtin/commit.c: use xstrdup_or_null instead of envdup
Date: Mon, 12 Jan 2015 20:58:33 -0500	[thread overview]
Message-ID: <20150113015832.GC18986@peff.net> (raw)
In-Reply-To: <20150113015427.GA5497@peff.net>

The only reason for envdup to be its own function is that we
have to save the result in a temporary string. With
xstrdup_or_null, we can feed the result of getenv()
directly.

Signed-off-by: Jeff King <peff@peff.net>
---
These ones need the temporary. Is the result more readable, or less?

 builtin/commit.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index 7d90c35..5cd1478 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -559,20 +559,14 @@ static void set_ident_var(char **buf, char *val)
 	*buf = val;
 }
 
-static char *envdup(const char *var)
-{
-	const char *val = getenv(var);
-	return val ? xstrdup(val) : NULL;
-}
-
 static void determine_author_info(struct strbuf *author_ident)
 {
 	char *name, *email, *date;
 	struct ident_split author;
 
-	name = envdup("GIT_AUTHOR_NAME");
-	email = envdup("GIT_AUTHOR_EMAIL");
-	date = envdup("GIT_AUTHOR_DATE");
+	name = xstrdup_or_null(getenv("GIT_AUTHOR_NAME"));
+	email = xstrdup_or_null(getenv("GIT_AUTHOR_EMAIL"));
+	date = xstrdup_or_null(getenv("GIT_AUTHOR_DATE"));
 
 	if (author_message) {
 		struct ident_split ident;
-- 
2.2.1.425.g441bb3c

  parent reply	other threads:[~2015-01-13  1:58 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-10 21:33 [PATCH] blame.c: fix garbled error message Lukas Fleischer
2015-01-12 19:08 ` Junio C Hamano
2015-01-12 20:40   ` Jeff King
2015-01-12 22:55   ` Junio C Hamano
2015-01-12 23:12     ` Jeff King
2015-01-13  0:11       ` Junio C Hamano
2015-01-13  1:54         ` Jeff King
2015-01-13  1:57           ` [PATCH 1/5] git-compat-util: add xstrdup_or_null helper Jeff King
2015-01-13  2:21             ` Jonathan Nieder
2015-01-13  2:23               ` Jeff King
2015-01-13  1:58           ` [PATCH 2/5] builtin/apply.c: use xstrdup_or_null instead of null_strdup Jeff King
2015-01-13  1:58           ` Jeff King [this message]
2015-01-13  1:59           ` [PATCH 4/5] use xstrdup_or_null to replace ternary conditionals Jeff King
2015-01-13  1:59           ` [PATCH 5/5] blame.c: fix garbled error message Jeff King
2015-01-14 14:21           ` [PATCH] " Lukas Fleischer
2015-01-14 17:22             ` Junio C Hamano
2015-01-14 20:49               ` Jeff King
2015-01-14 21:54                 ` Junio C Hamano
2015-01-12 23:18     ` Lukas Fleischer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150113015832.GC18986@peff.net \
    --to=peff@peff.net \
    --cc=git@cryptocrack.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).