unpack-trees: 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>
Brandon Williams committed
Feb 14, 2018 at 10:59 UTC
69caed593e4b66ae1efd457f1c060171dc9baa5a
1 file changed
+3
-3
unpack-trees.c
+3
-3
@@ -194,10 +194,10 @@ static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
194
static struct cache_entry *dup_entry(const struct cache_entry *ce)
195
{
196
unsigned int size = ce_size(ce);
197
- struct cache_entry *new = xmalloc(size);
197
+ struct cache_entry *new_entry = xmalloc(size);
198
199
- memcpy(new, ce, size);
200
- return new;
199
+ memcpy(new_entry, ce, size);
200
+ return new_entry;
201
}
202
203
static void add_entry(struct unpack_trees_options *o,