diff options
| author |  Jeff King <peff@peff.net> | 2017-03-02 03:21:27 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-02 11:05:04 -0800 |
| commit | 311fc74826ac91cd6f6ea932460f88c475bbb310 (patch) | |
| tree | 81a81dde991eafc37350a24589df1d6df9fbcadd | |
| parent | interpret_branch_name: move docstring to header file (diff) | |
| download | tgif-311fc74826ac91cd6f6ea932460f88c475bbb310.tar.xz | |
strbuf_branchname: drop return value
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_name.c | 5 | ||||
| -rw-r--r-- | strbuf.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sha1_name.c b/sha1_name.c index 28865b3a1f..4c1e91184b 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) @@ -562,7 +562,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 *, |