[PATCH 26/37] split-index: rename 'new' variables

[Brandon Williams <bmwill@google.com>]

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>
---
 split-index.c | 10 +++++-----
 split-index.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/split-index.c b/split-index.c
index 83e39ec8d..8ae4bee89 100644
--- a/split-index.c
+++ b/split-index.c
@@ -304,16 +304,16 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
 
 void replace_index_entry_in_base(struct index_state *istate,
 				 struct cache_entry *old,
-				 struct cache_entry *new)
+				 struct cache_entry *new_entry)
 {
 	if (old->index &&
 	    istate->split_index &&
 	    istate->split_index->base &&
 	    old->index <= istate->split_index->base->cache_nr) {
-		new->index = old->index;
-		if (old != istate->split_index->base->cache[new->index - 1])
-			free(istate->split_index->base->cache[new->index - 1]);
-		istate->split_index->base->cache[new->index - 1] = new;
+		new_entry->index = old->index;
+		if (old != istate->split_index->base->cache[new_entry->index - 1])
+			free(istate->split_index->base->cache[new_entry->index - 1]);
+		istate->split_index->base->cache[new_entry->index - 1] = new_entry;
 	}
 }
 
diff --git a/split-index.h b/split-index.h
index df91c1bda..43d66826e 100644
--- a/split-index.h
+++ b/split-index.h
@@ -21,7 +21,7 @@ struct split_index *init_split_index(struct index_state *istate);
 void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce);
 void replace_index_entry_in_base(struct index_state *istate,
 				 struct cache_entry *old,
-				 struct cache_entry *new);
+				 struct cache_entry *new_entry);
 int read_link_extension(struct index_state *istate,
 			const void *data, unsigned long sz);
 int write_link_extension(struct strbuf *sb,
-- 
2.16.0.rc1.238.g530d649a79-goog