diff options
| author | Brandon Williams <bmwill@google.com> | 2018-02-14 19:59:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-22 19:08:05 +0100 |
| commit | 75b7b971ae07882c5ec6f76e21a0dbd76d70c187 (patch) | |
| tree | fa8df071e194f3d0a916149cd4aa62d039df0330 | |
| parent | remote: rename 'new' variables (diff) | |
| download | git-75b7b971ae07882c5ec6f76e21a0dbd76d70c187.tar.xz git-75b7b971ae07882c5ec6f76e21a0dbd76d70c187.zip | |
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: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | split-index.c | 16 | ||||
| -rw-r--r-- | split-index.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/split-index.c b/split-index.c index 83e39ec8d7..7be5f748a6 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 df91c1bda8..43d66826eb 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, |