development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply: rename 'new' variables

Browse source 
Rename C++ keyword in order to bring the codebase closer to being able
to be compiled with a C++ compiler.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2018-02-14 10:59:30 -08:00 committed by Junio C Hamano
parent 6cbc7cfdfe
commit f1ae97d333
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
apply.c
View file

@ -2301,7 +2301,7 @@ static void update_pre_post_images(struct image *preimage,
size_t len, size_t postlen) size_t len, size_t postlen)
{ {
int i, ctx, reduced; int i, ctx, reduced;
char *new, *old, *fixed; char *new_buf, *old_buf, *fixed;
struct image fixed_preimage; struct image fixed_preimage;
/* /*
@ -2327,25 +2327,25 @@ static void update_pre_post_images(struct image *preimage,
* We trust the caller to tell us if the update can be done * We trust the caller to tell us if the update can be done
* in place (postlen==0) or not. * in place (postlen==0) or not.
*/ */
old = postimage->buf; old_buf = postimage->buf;
if (postlen) if (postlen)
new = postimage->buf = xmalloc(postlen); new_buf = postimage->buf = xmalloc(postlen);
else else
new = old; new_buf = old_buf;
fixed = preimage->buf; fixed = preimage->buf;
for (i = reduced = ctx = 0; i < postimage->nr; i++) { for (i = reduced = ctx = 0; i < postimage->nr; i++) {
size_t l_len = postimage->line[i].len; size_t l_len = postimage->line[i].len;
if (!(postimage->line[i].flag & LINE_COMMON)) { if (!(postimage->line[i].flag & LINE_COMMON)) {
/* an added line -- no counterparts in preimage */ /* an added line -- no counterparts in preimage */
memmove(new, old, l_len); memmove(new_buf, old_buf, l_len);
old += l_len; old_buf += l_len;
new += l_len; new_buf += l_len;
continue; continue;
} }
/* a common context -- skip it in the original postimage */ /* a common context -- skip it in the original postimage */
old += l_len; old_buf += l_len;
/* and find the corresponding one in the fixed preimage */ /* and find the corresponding one in the fixed preimage */
while (ctx < preimage->nr && while (ctx < preimage->nr &&
@ -2365,21 +2365,21 @@ static void update_pre_post_images(struct image *preimage,
/* and copy it in, while fixing the line length */ /* and copy it in, while fixing the line length */
l_len = preimage->line[ctx].len; l_len = preimage->line[ctx].len;
memcpy(new, fixed, l_len); memcpy(new_buf, fixed, l_len);
new += l_len; new_buf += l_len;
fixed += l_len; fixed += l_len;
postimage->line[i].len = l_len; postimage->line[i].len = l_len;
ctx++; ctx++;
} }
if (postlen if (postlen
? postlen < new - postimage->buf ? postlen < new_buf - postimage->buf
: postimage->len < new - postimage->buf) : postimage->len < new_buf - postimage->buf)
die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d", die("BUG: caller miscounted postlen: asked %d, orig = %d, used = %d",
(int)postlen, (int) postimage->len, (int)(new - postimage->buf)); (int)postlen, (int) postimage->len, (int)(new_buf - postimage->buf));
/* Fix the length of the whole thing */ /* Fix the length of the whole thing */
postimage->len = new - postimage->buf; postimage->len = new_buf - postimage->buf;
postimage->nr -= reduced; postimage->nr -= reduced;
} }
@ -4163,30 +4163,30 @@ static void show_mode_change(struct patch *p, int show_name)
static void show_rename_copy(struct patch *p) static void show_rename_copy(struct patch *p)
{ {
const char *renamecopy = p->is_rename ? "rename" : "copy"; const char *renamecopy = p->is_rename ? "rename" : "copy";
const char *old, *new; const char *old_name, *new_name;
/* Find common prefix */ /* Find common prefix */
old = p->old_name; old_name = p->old_name;
new = p->new_name; new_name = p->new_name;
while (1) { while (1) {
const char *slash_old, *slash_new; const char *slash_old, *slash_new;
slash_old = strchr(old, '/'); slash_old = strchr(old_name, '/');
slash_new = strchr(new, '/'); slash_new = strchr(new_name, '/');
if (!slash_old || if (!slash_old ||
!slash_new || !slash_new ||
slash_old - old != slash_new - new || slash_old - old_name != slash_new - new_name ||
memcmp(old, new, slash_new - new)) memcmp(old_name, new_name, slash_new - new_name))
break; break;
old = slash_old + 1; old_name = slash_old + 1;
new = slash_new + 1; new_name = slash_new + 1;
} }
/* p->old_name thru old is the common prefix, and old and new /* p->old_name thru old_name is the common prefix, and old_name and new_name
* through the end of names are renames * through the end of names are renames
*/ */
if (old != p->old_name) if (old_name != p->old_name)
printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy, printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
(int)(old - p->old_name), p->old_name, (int)(old_name - p->old_name), p->old_name,
old, new, p->score); old_name, new_name, p->score);
else else
printf(" %s %s => %s (%d%%)\n", renamecopy, printf(" %s %s => %s (%d%%)\n", renamecopy,
p->old_name, p->new_name, p->score); p->old_name, p->new_name, p->score);