diff options
| author |  Brandon Williams <bmwill@google.com> | 2018-02-14 10:59:51 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-22 10:08:05 -0800 |
| commit | 69caed593e4b66ae1efd457f1c060171dc9baa5a (patch) | |
| tree | 8f46cce04a7abbb6c557dbd28f5068adfcb34bd8 | |
| parent | trailer: rename 'new' variables (diff) | |
| download | tgif-69caed593e4b66ae1efd457f1c060171dc9baa5a.tar.xz | |
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>
| -rw-r--r-- | unpack-trees.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 96c3327f19..bdedabcd57 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, |