kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Jeff King 2017-03-02 03:21:27 -05:00 committed by Junio C Hamano
parent e322b60d65
commit 311fc74826
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sha1_name.c
View File

@ -1279,17 +1279,14 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
return -1; 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 len = strlen(name);
int used = interpret_branch_name(name, len, sb); int used = interpret_branch_name(name, len, sb);


if (used == len)
return 0;
if (used < 0) if (used < 0)
used = 0; used = 0;
strbuf_add(sb, name + used, len - used); strbuf_add(sb, name + used, len - used);
return len;
} }


int strbuf_check_branch_ref(struct strbuf *sb, const char *name) int strbuf_check_branch_ref(struct strbuf *sb, const char *name)

2
strbuf.h
View File

@ -562,7 +562,7 @@ static inline void strbuf_complete_line(struct strbuf *sb)
strbuf_complete(sb, '\n'); 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 int strbuf_check_branch_ref(struct strbuf *sb, const char *name);


extern void strbuf_addstr_urlencode(struct strbuf *, const char *, extern void strbuf_addstr_urlencode(struct strbuf *, const char *,