From: Junio C Hamano <gitster@pobox.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH 04/10] mailmap: simplify map_user() interface
Date: Sun, 06 Jan 2013 14:56:28 -0800 [thread overview]
Message-ID: <7vehhxnco3.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1357421206-5014-5-git-send-email-apelisse@gmail.com> (Antoine Pelisse's message of "Sat, 5 Jan 2013 22:26:40 +0100")
Antoine Pelisse <apelisse@gmail.com> writes:
> diff --git a/builtin/blame.c b/builtin/blame.c
> index dd4aff9..86450e3 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> ...
> @@ -1356,51 +1356,61 @@ static void get_ac_line(const char *inbuf, const char *what,
> len = strlen(tmp);
> else
> len = endp - tmp;
>
> if (split_ident_line(&ident, tmp, len)) {
> error_out:
> /* Ugh */
> + tmp = "(unknown)";
> + strbuf_addstr(name, tmp);
> + strbuf_addstr(mail, tmp);
> + strbuf_addstr(tz, tmp);
> *time = 0;
> return;
> }
>
> namelen = ident.name_end - ident.name_begin;
> + tmpname = ident.name_begin;
>
> + maillen = ident.mail_end - ident.mail_begin;
> + tmpmail = ident.mail_begin;
>
> *time = strtoul(ident.date_begin, NULL, 10);
>
> + len = ident.tz_end - ident.tz_begin;
> + strbuf_add(tz, ident.tz_begin, len);
>
> /*
> * Now, convert both name and e-mail using mailmap
> */
> + map_user(&mailmap, &tmpmail, &maillen,
> + &tmpname, &namelen);
I like the general simplification this change gives us, but do we
still want to name these variables "tmp"-something? At least to me,
it makes it look like the variable holds a pointer to a piece of
memory that was temporarily allocated. Calling it "mail_begin" or
something might be less confusing.
The changes to pretty.c (pp_user_info) and shortlog.c
(insert_one_record) calls these variables mailbuf and namebuf,
so perhaps these are better names?
next prev parent reply other threads:[~2013-01-06 22:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-05 21:26 [PATCH 00/10] Log mailmap optimization Antoine Pelisse
2013-01-05 21:26 ` [PATCH 01/10] list_lookup: create case and length search Antoine Pelisse
2013-01-05 22:39 ` Junio C Hamano
2013-01-07 22:37 ` Junio C Hamano
2013-01-05 21:26 ` [PATCH 02/10] Use split_ident_line to parse author and committer Antoine Pelisse
2013-01-05 21:26 ` [PATCH 03/10] mailmap: remove email copy and length limitation Antoine Pelisse
2013-01-05 21:26 ` [PATCH 04/10] mailmap: simplify map_user() interface Antoine Pelisse
2013-01-06 22:56 ` Junio C Hamano [this message]
2013-01-05 21:26 ` [PATCH 05/10] mailmap: add mailmap structure to rev_info and pp Antoine Pelisse
2013-01-05 21:26 ` [PATCH 06/10] pretty: use mailmap to display username and email Antoine Pelisse
2013-01-05 21:26 ` [PATCH 07/10] log: add --use-mailmap option Antoine Pelisse
2013-01-05 21:26 ` [PATCH 08/10] test: add test for " Antoine Pelisse
2013-01-05 21:26 ` [PATCH 09/10] log: grep author/committer using mailmap Antoine Pelisse
2013-01-05 21:26 ` [PATCH 10/10] log: add log.mailmap configuration option Antoine Pelisse
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vehhxnco3.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).