mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-redundant: 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:33 -08:00 committed by Junio C Hamano
parent 8adda462a2
commit b2e4bafb68
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
builtin/pack-redundant.c
View File

@ -48,17 +48,17 @@ static inline void llist_item_put(struct llist_item *item)
static inline struct llist_item *llist_item_get(void) static inline struct llist_item *llist_item_get(void)
{ {
struct llist_item *new; struct llist_item *new_item;
if ( free_nodes ) { if ( free_nodes ) {
new = free_nodes; new_item = free_nodes;
free_nodes = free_nodes->next; free_nodes = free_nodes->next;
} else { } else {
int i = 1; int i = 1;
ALLOC_ARRAY(new, BLKSIZE); ALLOC_ARRAY(new_item, BLKSIZE);
for (; i < BLKSIZE; i++) for (; i < BLKSIZE; i++)
llist_item_put(&new[i]); llist_item_put(&new_item[i]);
} }
return new; return new_item;
} }
static void llist_free(struct llist *list) static void llist_free(struct llist *list)
@ -80,26 +80,26 @@ static inline void llist_init(struct llist **list)
static struct llist * llist_copy(struct llist *list) static struct llist * llist_copy(struct llist *list)
{ {
struct llist *ret; struct llist *ret;
struct llist_item *new, *old, *prev; struct llist_item *new_item, *old_item, *prev;
llist_init(&ret); llist_init(&ret);
if ((ret->size = list->size) == 0) if ((ret->size = list->size) == 0)
return ret; return ret;
new = ret->front = llist_item_get(); new_item = ret->front = llist_item_get();
new->sha1 = list->front->sha1; new_item->sha1 = list->front->sha1;
old = list->front->next; old_item = list->front->next;
while (old) { while (old_item) {
prev = new; prev = new_item;
new = llist_item_get(); new_item = llist_item_get();
prev->next = new; prev->next = new_item;
new->sha1 = old->sha1; new_item->sha1 = old_item->sha1;
old = old->next; old_item = old_item->next;
} }
new->next = NULL; new_item->next = NULL;
ret->back = new; ret->back = new_item;
return ret; return ret;
} }
@ -108,24 +108,24 @@ static inline struct llist_item *llist_insert(struct llist *list,
struct llist_item *after, struct llist_item *after,
const unsigned char *sha1) const unsigned char *sha1)
{ {
struct llist_item *new = llist_item_get(); struct llist_item *new_item = llist_item_get();
new->sha1 = sha1; new_item->sha1 = sha1;
new->next = NULL; new_item->next = NULL;
if (after != NULL) { if (after != NULL) {
new->next = after->next; new_item->next = after->next;
after->next = new; after->next = new_item;
if (after == list->back) if (after == list->back)
list->back = new; list->back = new_item;
} else {/* insert in front */ } else {/* insert in front */
if (list->size == 0) if (list->size == 0)
list->back = new; list->back = new_item;
else else
new->next = list->front; new_item->next = list->front;
list->front = new; list->front = new_item;
} }
list->size++; list->size++;
return new; return new_item;
} }
static inline struct llist_item *llist_insert_back(struct llist *list, static inline struct llist_item *llist_insert_back(struct llist *list,