From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Kent R. Spillner" <kspillner@acm.org>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH 2/3] diff_scoreopt_parse(): use skip_prefix_if_present()
Date: Wed, 5 Feb 2014 07:25:16 +0100 [thread overview]
Message-ID: <1391581517-8586-3-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1391581517-8586-1-git-send-email-mhagger@alum.mit.edu>
Whenever skip_prefix_defval() was called, opt was still equal to
*opt_p. So we can use skip_prefix_if_present() instead.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
diff.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index d629cc5..a07fe9d 100644
--- a/diff.c
+++ b/diff.c
@@ -3890,13 +3890,13 @@ static int diff_scoreopt_parse(const char **opt_p)
*opt_p = opt;
if (cmd == '-') {
/* convert the long-form arguments into short-form versions */
- if ((opt = skip_prefix_defval(opt, "break-rewrites", *opt_p)) != *opt_p) {
+ if ((opt = skip_prefix_if_present(opt, "break-rewrites")) != *opt_p) {
if (*opt == 0 || *opt++ == '=')
cmd = 'B';
- } else if ((opt = skip_prefix_defval(opt, "find-copies", *opt_p)) != *opt_p) {
+ } else if ((opt = skip_prefix_if_present(opt, "find-copies")) != *opt_p) {
if (*opt == 0 || *opt++ == '=')
cmd = 'C';
- } else if ((opt = skip_prefix_defval(opt, "find-renames", *opt_p)) != *opt_p) {
+ } else if ((opt = skip_prefix_if_present(opt, "find-renames")) != *opt_p) {
if (*opt == 0 || *opt++ == '=')
cmd = 'M';
}
--
1.8.5.3
next prev parent reply other threads:[~2014-02-05 6:26 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 6:25 [PATCH 0/3] Add a function skip_prefix_if_present() Michael Haggerty
2014-02-05 6:25 ` [PATCH 1/3] Add and use " Michael Haggerty
2014-02-05 6:25 ` Michael Haggerty [this message]
2014-02-05 6:25 ` [PATCH 3/3] rev_is_head(): use skip_prefix() Michael Haggerty
2014-02-05 6:55 ` [PATCH 0/3] Add a function skip_prefix_if_present() Michael Haggerty
2014-02-05 17:26 ` Jeff King
2014-02-06 12:19 ` Duy Nguyen
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=1391581517-8586-3-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kspillner@acm.org \
--cc=pclouds@gmail.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).