From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jacob Keller <jacob.keller@gmail.com>,
Karthik Nayak <karthik.188@gmail.com>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Git List <git@vger.kernel.org>
Subject: [PATCH 2/8] strbuf_branchname: drop return value
Date: Tue, 28 Feb 2017 07:07:34 -0500 [thread overview]
Message-ID: <20170228120734.3kbfs74yxbr2lj42@sigill.intra.peff.net> (raw)
In-Reply-To: <20170228120633.zkwfqms57fk7dkl5@sigill.intra.peff.net>
The return value from strbuf_branchname() is confusing and
useless: it's 0 if the whole name was consumed by an @-mark,
but otherwise is the length of the original name we fed.
No callers actually look at the return value, so let's just
get rid of it.
Signed-off-by: Jeff King <peff@peff.net>
---
sha1_name.c | 5 +----
strbuf.h | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 28865b3a1..4c1e91184 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1279,17 +1279,14 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
return -1;
}
-int strbuf_branchname(struct strbuf *sb, const char *name)
+void strbuf_branchname(struct strbuf *sb, const char *name)
{
int len = strlen(name);
int used = interpret_branch_name(name, len, sb);
- if (used == len)
- return 0;
if (used < 0)
used = 0;
strbuf_add(sb, name + used, len - used);
- return len;
}
int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
diff --git a/strbuf.h b/strbuf.h
index cf1b5409e..47df0500d 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -560,7 +560,7 @@ static inline void strbuf_complete_line(struct strbuf *sb)
strbuf_complete(sb, '\n');
}
-extern int strbuf_branchname(struct strbuf *sb, const char *name);
+extern void strbuf_branchname(struct strbuf *sb, const char *name);
extern int strbuf_check_branch_ref(struct strbuf *sb, const char *name);
extern void strbuf_addstr_urlencode(struct strbuf *, const char *,
--
2.12.0.359.gd4c8c42e9
next prev parent reply other threads:[~2017-02-28 14:54 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-27 4:52 [BUG] branch renamed to 'HEAD' Luc Van Oostenryck
2017-02-27 6:13 ` Karthik Nayak
2017-02-27 6:47 ` Luc Van Oostenryck
2017-02-27 7:49 ` Jeff King
2017-02-27 8:01 ` Jeff King
2017-02-27 9:02 ` Jeff King
2017-02-27 9:47 ` Luc Van Oostenryck
2017-02-27 22:28 ` Junio C Hamano
2017-02-27 23:05 ` Jacob Keller
2017-02-28 0:33 ` Junio C Hamano
2017-02-28 0:53 ` Jeff King
2017-02-28 7:58 ` Jacob Keller
2017-02-28 12:06 ` Jeff King
2017-02-28 12:07 ` [PATCH 1/8] interpret_branch_name: move docstring to header file Jeff King
2017-02-28 12:07 ` Jeff King [this message]
2017-02-28 12:07 ` [PATCH 3/8] strbuf_branchname: add docstring Jeff King
2017-02-28 12:14 ` [PATCH 4/8] interpret_branch_name: allow callers to restrict expansions Jeff King
2017-02-28 12:23 ` Jeff King
2017-02-28 12:33 ` Jeff King
2017-02-28 20:27 ` Junio C Hamano
2017-02-28 21:37 ` Jeff King
2017-02-28 12:15 ` [PATCH 5/8] t3204: test git-branch @-expansion corner cases Jeff King
2017-02-28 12:15 ` [PATCH 6/8] branch: restrict @-expansions when deleting Jeff King
2017-02-28 12:16 ` [PATCH 7/8] strbuf_check_ref_format(): expand only local branches Jeff King
2017-02-28 12:17 ` [PATCH 8/8] checkout: restrict @-expansions when finding branch Jeff King
2017-02-28 22:48 ` [BUG] branch renamed to 'HEAD' Jacob Keller
2017-03-01 17:35 ` Junio C Hamano
2017-02-28 0:49 ` Jeff King
2017-02-28 0:42 ` Jeff King
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=20170228120734.3kbfs74yxbr2lj42@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=karthik.188@gmail.com \
--cc=luc.vanoostenryck@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.
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).