[PATCH v2 2/8] strbuf_branchname: drop return value
- From
Jeff King <peff@peff.net>
- Date
- Mar 2, 2017, 08:21 UTC
- Message-ID
- <20170302082126.dupi3jcclhj6ejtv@sigill.intra.peff.net>
- In-Reply-To
- <20170302082100.edaretznmlralswa@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.367.gb23790f66