From: Anders F Björklund <anders.f.bjorklund@gmail.com>
Date: Sun, 16 Sep 2018 16:45:55 +0000 (+0200)
Subject: Removed locally shadowed global variables
X-Git-Tag: v3.5~26^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e693062c564ffaf38521a1f0a2735e9957e5d5;p=thirdparty%2Fccache.git

Removed locally shadowed global variables

Rename the local, or remove the parameter
---

diff --git a/src/ccache.c b/src/ccache.c
index e5c606384..5d893d93e 100644
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -1619,9 +1619,9 @@ calculate_common_hash(struct args *args, struct mdfour *hash)
 	// Also hash the compiler name as some compilers use hard links and behave
 	// differently depending on the real name.
 	hash_delimiter(hash, "cc_name");
-	char *p = basename(args->argv[0]);
-	hash_string(hash, p);
-	free(p);
+	char *base = basename(args->argv[0]);
+	hash_string(hash, base);
+	free(base);
 
 	// Possibly hash the current working directory.
 	if (generating_debuginfo && conf->hash_dir) {
@@ -1662,7 +1662,7 @@ calculate_common_hash(struct args *args, struct mdfour *hash)
 		}
 		if (dir) {
 			char *base_name = basename(output_obj);
-			p = remove_extension(base_name);
+			char *p = remove_extension(base_name);
 			free(base_name);
 			char *gcda_path = format("%s/%s.gcda", dir, p);
 			cc_log("Hashing coverage path %s", gcda_path);
@@ -3586,7 +3586,7 @@ ccache_main_options(int argc, char *argv[])
 
 		case 's': // --show-stats
 			initialize();
-			stats_summary(conf);
+			stats_summary();
 			break;
 
 		case 'V': // --version
diff --git a/src/ccache.h b/src/ccache.h
index ad312f8b7..fb9e02457 100644
--- a/src/ccache.h
+++ b/src/ccache.h
@@ -207,7 +207,7 @@ void stats_update(enum stats stat);
 void stats_flush(void);
 unsigned stats_get_pending(enum stats stat);
 void stats_zero(void);
-void stats_summary(struct conf *conf);
+void stats_summary(void);
 void stats_update_size(int64_t size, int files);
 void stats_get_obsolete_limits(const char *dir, unsigned *maxfiles,
                                uint64_t *maxsize);
diff --git a/src/conf.c b/src/conf.c
index dc917092e..a08dbb921 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -253,8 +253,8 @@ handle_conf_setting(struct conf *conf, const char *key, const char *value,
 			fatal("invalid boolean environment variable value \"%s\"", value);
 		}
 
-		bool *value = (bool *)((char *)conf + item->offset);
-		*value = !negate_boolean;
+		bool *boolvalue = (bool *)((char *)conf + item->offset);
+		*boolvalue = !negate_boolean;
 		goto out;
 	}
 
diff --git a/src/stats.c b/src/stats.c
index 5a150adfc..b1b64b3a3 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -445,7 +445,7 @@ stats_get_pending(enum stats stat)
 
 // Sum and display the total stats for all cache dirs.
 void
-stats_summary(struct conf *conf)
+stats_summary(void)
 {
 	struct counters *counters = counters_init(STATS_END);
 	time_t updated = 0;