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

interpret_branch_name: rename "cp" variable to "at"

Browse Source 
In the original version of this function, "cp" acted as a
pointer to many different things. Since the refactoring in
the last patch, it only marks the at-sign in the string.
Let's use a more descriptive variable name.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-01-15 03:27:32 -05:00 committed by Junio C Hamano
parent a39c14af82
commit f278f40f09
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sha1_name.c
View File

@ -1119,7 +1119,7 @@ static int interpret_upstream_mark(const char *name, int namelen,
*/ */
int interpret_branch_name(const char *name, int namelen, struct strbuf *buf) int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
{ {
char *cp; char *at;
int len = interpret_nth_prior_checkout(name, buf); int len = interpret_nth_prior_checkout(name, buf);
if (!namelen) if (!namelen)
@ -1134,15 +1134,15 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
return reinterpret(name, namelen, len, buf); return reinterpret(name, namelen, len, buf);
} }
cp = strchr(name, '@'); at = strchr(name, '@');
if (!cp) if (!at)
return -1; return -1;
len = interpret_empty_at(name, namelen, cp - name, buf); len = interpret_empty_at(name, namelen, at - name, buf);
if (len > 0) if (len > 0)
return reinterpret(name, namelen, len, buf); return reinterpret(name, namelen, len, buf);
len = interpret_upstream_mark(name, namelen, cp - name, buf); len = interpret_upstream_mark(name, namelen, at - name, buf);
if (len > 0) if (len > 0)
return len; return len;