From: Brandon Williams <bmwill@google.com>
Date: Wed, 14 Feb 2018 18:59:26 +0000 (-0800)
Subject: pack-objects: rename 'this' variables
X-Git-Tag: v2.17.0-rc0~35^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=095b3b2c04850368b2ec77b96db29c3ce5b9424c;p=thirdparty%2Fgit.git

pack-objects: rename 'this' 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>
---

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 6b9cfc289d..bfda8602c4 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1376,10 +1376,10 @@ static void cleanup_preferred_base(void)
 	it = pbase_tree;
 	pbase_tree = NULL;
 	while (it) {
-		struct pbase_tree *this = it;
-		it = this->next;
-		free(this->pcache.tree_data);
-		free(this);
+		struct pbase_tree *tmp = it;
+		it = tmp->next;
+		free(tmp->pcache.tree_data);
+		free(tmp);
 	}
 
 	for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {