From 76a2b0f0c5278d2e2a96e07896bd05883bbe67bd Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 14 Aug 2010 11:53:24 +0200
Subject: [PATCH] Generalize cc_log_executed_command

---
 ccache.c  | 2 +-
 ccache.h  | 2 +-
 execute.c | 2 +-
 util.c    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ccache.c b/ccache.c
index d78b2bd79..02614ebbb 100644
--- a/ccache.c
+++ b/ccache.c
@@ -271,7 +271,7 @@ failed(void)
 	}
 
 	cc_log("Failed; falling back to running the real compiler");
-	cc_log_executed_command(orig_args->argv);
+	cc_log_argv("Executing ", orig_args->argv);
 	exitfn_call();
 	execv(orig_args->argv[0], orig_args->argv);
 	fatal("%s: execv returned (%s)", orig_args->argv[0], strerror(errno));
diff --git a/ccache.h b/ccache.h
index bd17e5d6e..cb5bb3b85 100644
--- a/ccache.h
+++ b/ccache.h
@@ -104,7 +104,7 @@ int hash_file(struct mdfour *md, const char *fname);
 /* util.c */
 
 void cc_log(const char *format, ...) ATTR_FORMAT(printf, 1, 2);
-void cc_log_executed_command(char **argv);
+void cc_log_argv(const char *prefix, char **argv);
 void fatal(const char *format, ...) ATTR_FORMAT(printf, 1, 2);
 
 void copy_fd(int fd_in, int fd_out);
diff --git a/execute.c b/execute.c
index ee769d05f..a3a0894e9 100644
--- a/execute.c
+++ b/execute.c
@@ -179,7 +179,7 @@ execute(char **argv, const char *path_stdout, const char *path_stderr)
 	pid_t pid;
 	int status;
 
-	cc_log_executed_command(argv);
+	cc_log_argv("Executing ", argv);
 
 	pid = fork();
 	if (pid == -1) fatal("Failed to fork");
diff --git a/util.c b/util.c
index 8a9860936..08902d14f 100644
--- a/util.c
+++ b/util.c
@@ -116,14 +116,14 @@ cc_log(const char *format, ...)
  * Log an executed command to the CCACHE_LOGFILE location.
  */
 void
-cc_log_executed_command(char **argv)
+cc_log_argv(const char *prefix, char **argv)
 {
 	if (!init_log()) {
 		return;
 	}
 
 	log_prefix();
-	fprintf(logfile, "Executing ");
+	fputs(prefix, logfile);
 	print_command(logfile, argv);
 	fflush(logfile);
 }
-- 
2.47.3