From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 25 Mar 2017 16:19:51 +0000 (+0100)
Subject: Group related compiler_is_* functions
X-Git-Tag: v3.4~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f6b6ffd754aabfe08db37ef74e78ee759150ba8;p=thirdparty%2Fccache.git

Group related compiler_is_* functions
---

diff --git a/ccache.c b/ccache.c
index 9f8a44664..a9648b770 100644
--- a/ccache.c
+++ b/ccache.c
@@ -459,6 +459,36 @@ clean_up_internal_tempdir(void)
 	closedir(dir);
 }
 
+// Note that these compiler checks are unreliable, so nothing should
+// hard-depend on them.
+
+static bool
+compiler_is_clang(struct args *args)
+{
+	char *name = basename(args->argv[0]);
+	bool result = strstr(name, "clang") != NULL;
+	free(name);
+	return result;
+}
+
+static bool
+compiler_is_gcc(struct args *args)
+{
+	char *name = basename(args->argv[0]);
+	bool result = strstr(name, "gcc") || strstr(name, "g++");
+	free(name);
+	return result;
+}
+
+static bool
+compiler_is_pump(struct args *args)
+{
+	char *name = basename(args->argv[0]);
+	bool result = str_eq(name, "pump") || str_eq(name, "distcc-pump");
+	free(name);
+	return result;
+}
+
 static char *
 get_current_working_dir(void)
 {
@@ -1082,15 +1112,6 @@ void update_manifest_file(void)
 	}
 }
 
-static bool
-compiler_is_pump(struct args *args)
-{
-	char *name = basename(args->argv[0]);
-	bool result = str_eq(name, "pump") || str_eq(name, "distcc-pump");
-	free(name);
-	return result;
-}
-
 // Run the real compiler and put the result in cache.
 static void
 to_cache(struct args *args)
@@ -1570,27 +1591,6 @@ hash_compiler(struct mdfour *hash, struct stat *st, const char *path,
 	}
 }
 
-// Note that these compiler checks are unreliable, so nothing should
-// hard-depend on them.
-
-static bool
-compiler_is_clang(struct args *args)
-{
-	char *name = basename(args->argv[0]);
-	bool result = strstr(name, "clang") != NULL;
-	free(name);
-	return result;
-}
-
-static bool
-compiler_is_gcc(struct args *args)
-{
-	char *name = basename(args->argv[0]);
-	bool result = strstr(name, "gcc") || strstr(name, "g++");
-	free(name);
-	return result;
-}
-
 // Update a hash sum with information common for the direct and preprocessor
 // modes.
 static void