undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve_ref_1(): eliminate local variable

Browse Source 
In place of `buf`, use `refname`, which is anyway a better description
of what is being pointed at.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2016-04-07 15:02:58 -04:00 committed by Junio C Hamano
parent a70a93b794
commit 90c28ae11c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
refs/files-backend.c
View File

@ -1426,7 +1426,6 @@ static const char *resolve_ref_1(const char *refname,
for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) { for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) {
const char *path; const char *path;
struct stat st; struct stat st;
char *buf;
int fd; int fd;
strbuf_reset(sb_path); strbuf_reset(sb_path);
@ -1532,21 +1531,21 @@ static const char *resolve_ref_1(const char *refname,
return refname; return refname;
} }
*flags |= REF_ISSYMREF; *flags |= REF_ISSYMREF;
buf = sb_contents->buf + 4; refname = sb_contents->buf + 4;
while (isspace(*buf)) while (isspace(*refname))
buf++; refname++;
strbuf_reset(sb_refname); strbuf_reset(sb_refname);
strbuf_addstr(sb_refname, buf); strbuf_addstr(sb_refname, refname);
refname = sb_refname->buf; refname = sb_refname->buf;
if (resolve_flags & RESOLVE_REF_NO_RECURSE) { if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
hashclr(sha1); hashclr(sha1);
return refname; return refname;
} }
if (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) { if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
*flags |= REF_ISBROKEN; *flags |= REF_ISBROKEN;
if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
!refname_is_safe(buf)) { !refname_is_safe(refname)) {
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
} }