Commit 75b7b971 authored by Brandon Williams's avatar Brandon Williams Committed by Junio C Hamano

split-index: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able
to be compiled with a C++ compiler.
Signed-off-by: default avatarBrandon Williams <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent f3bbe630
...@@ -303,17 +303,17 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce ...@@ -303,17 +303,17 @@ void save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce
} }
void replace_index_entry_in_base(struct index_state *istate, void replace_index_entry_in_base(struct index_state *istate,
struct cache_entry *old, struct cache_entry *old_entry,
struct cache_entry *new) struct cache_entry *new_entry)
{ {
if (old->index && if (old_entry->index &&
istate->split_index && istate->split_index &&
istate->split_index->base && istate->split_index->base &&
old->index <= istate->split_index->base->cache_nr) { old_entry->index <= istate->split_index->base->cache_nr) {
new->index = old->index; new_entry->index = old_entry->index;
if (old != istate->split_index->base->cache[new->index - 1]) if (old_entry != istate->split_index->base->cache[new_entry->index - 1])
free(istate->split_index->base->cache[new->index - 1]); free(istate->split_index->base->cache[new_entry->index - 1]);
istate->split_index->base->cache[new->index - 1] = new; istate->split_index->base->cache[new_entry->index - 1] = new_entry;
} }
} }
......
...@@ -21,7 +21,7 @@ struct split_index *init_split_index(struct index_state *istate); ...@@ -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 save_or_free_index_entry(struct index_state *istate, struct cache_entry *ce);
void replace_index_entry_in_base(struct index_state *istate, void replace_index_entry_in_base(struct index_state *istate,
struct cache_entry *old, struct cache_entry *old,
struct cache_entry *new); struct cache_entry *new_entry);
int read_link_extension(struct index_state *istate, int read_link_extension(struct index_state *istate,
const void *data, unsigned long sz); const void *data, unsigned long sz);
int write_link_extension(struct strbuf *sb, int write_link_extension(struct strbuf *sb,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment