[PATCH v2 29/37] unpack-trees: rename 'new' variables
- From
- Brandon Williams <bmwill@google.com>
- Date
- Feb 14, 2018, 18:59 UTC
- Message-ID
- <20180214185959.221906-30-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> --- unpack-trees.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c index 96c3327f1..bdedabcd5 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -194,10 +194,10 @@ static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, static struct cache_entry *dup_entry(const struct cache_entry *ce) { unsigned int size = ce_size(ce); - struct cache_entry *new = xmalloc(size); + struct cache_entry *new_entry = xmalloc(size); - memcpy(new, ce, size); - return new; + memcpy(new_entry, ce, size); + return new_entry; } static void add_entry(struct unpack_trees_options *o,
-- 2.16.1.291.g4437f3f132-goog