From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 15/19] refs: simplify parsing of reflog entries
Date: Tue, 14 Feb 2017 02:31:37 +0000 [thread overview]
Message-ID: <20170214023141.842922-16-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20170214023141.842922-1-sandals@crustytoothpaste.net>
The current code for reflog entries uses a lot of hard-coded constants,
making it hard to read and modify. Use parse_oid_hex and two temporary
variables to simplify the code and reduce the use of magic constants.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
refs/files-backend.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index d7a5fd2a7c..09227a3f63 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3117,12 +3117,14 @@ static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *c
char *email_end, *message;
unsigned long timestamp;
int tz;
+ const char *p = sb->buf;
+ const int minlen = 2 * GIT_SHA1_HEXSZ + 3;
/* old SP new SP name <email> SP time TAB msg LF */
- if (sb->len < 83 || sb->buf[sb->len - 1] != '\n' ||
- get_oid_hex(sb->buf, &ooid) || sb->buf[40] != ' ' ||
- get_oid_hex(sb->buf + 41, &noid) || sb->buf[81] != ' ' ||
- !(email_end = strchr(sb->buf + 82, '>')) ||
+ if (sb->len < minlen || sb->buf[sb->len - 1] != '\n' ||
+ parse_oid_hex(p, &ooid, &p) || *p++ != ' ' ||
+ parse_oid_hex(p, &noid, &p) || *p++ != ' ' ||
+ !(email_end = strchr(p, '>')) ||
email_end[1] != ' ' ||
!(timestamp = strtoul(email_end + 2, &message, 10)) ||
!message || message[0] != ' ' ||
@@ -3136,7 +3138,7 @@ static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *c
message += 6;
else
message += 7;
- return fn(&ooid, &noid, sb->buf + 82, timestamp, tz, message, cb_data);
+ return fn(&ooid, &noid, sb->buf + minlen - 1, timestamp, tz, message, cb_data);
}
static char *find_beginning_of_line(char *bob, char *scan)
--
2.11.0
next prev parent reply other threads:[~2017-02-14 2:32 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-14 2:31 [PATCH v2 00/19] object_id part 6 brian m. carlson
2017-02-14 2:31 ` [PATCH v2 01/19] builtin/commit: convert to struct object_id brian m. carlson
2017-02-14 2:31 ` [PATCH v2 02/19] builtin/diff-tree: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 03/19] builtin/describe: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 04/19] builtin/fast-export: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 05/19] builtin/fmt-merge-message: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 06/19] builtin/grep: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 07/19] builtin/branch: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 08/19] builtin/clone: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 09/19] builtin/merge: " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 10/19] Convert remaining callers of resolve_refdup to object_id brian m. carlson
2017-02-14 2:31 ` [PATCH v2 11/19] builtin/replace: convert to struct object_id brian m. carlson
2017-02-17 8:44 ` Michael Haggerty
2017-02-14 2:31 ` [PATCH v2 12/19] reflog-walk: convert struct reflog_info " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 13/19] refs: convert each_reflog_ent_fn " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 14/19] hex: introduce parse_oid_hex brian m. carlson
2017-02-17 9:26 ` Michael Haggerty
2017-02-14 2:31 ` brian m. carlson [this message]
2017-02-17 9:41 ` [PATCH v2 15/19] refs: simplify parsing of reflog entries Michael Haggerty
2017-02-14 2:31 ` [PATCH v2 16/19] sha1_file: introduce an nth_packed_object_oid function brian m. carlson
2017-02-14 2:31 ` [PATCH v2 17/19] Convert object iteration callbacks to struct object_id brian m. carlson
2017-02-14 2:31 ` [PATCH v2 18/19] builtin/merge-base: convert " brian m. carlson
2017-02-14 2:31 ` [PATCH v2 19/19] wt-status: " brian m. carlson
2017-02-14 22:02 ` [PATCH v2 00/19] object_id part 6 Junio C Hamano
2017-02-17 9:55 ` Michael Haggerty
2017-02-17 21:45 ` brian m. carlson
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=20170214023141.842922-16-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/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).