[PATCH v2 26/37] split-index: rename 'new' variables
- From
- Brandon Williams <bmwill@google.com>
- Date
- Feb 14, 2018, 18:59 UTC
- Message-ID
- <20180214185959.221906-27-bmwill@google.com>
- In-Reply-To
- <20180214185959.221906-1-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 | 16 ++++++++-------- split-index.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/split-index.c b/split-index.c index 83e39ec8d..7be5f748a 100644 --- a/split-index.c +++ b/split-index.c @@ -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, - struct cache_entry *old, - struct cache_entry *new) + struct cache_entry *old_entry, + struct cache_entry *new_entry) { - if (old->index && + if (old_entry->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; + old_entry->index <= istate->split_index->base->cache_nr) { + new_entry->index = old_entry->index; + if (old_entry != 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.1.291.g4437f3f132-goog