Generalize cc_log_executed_command

diff --git a/ccache.c b/ccache.c
index d78b2bd79eac24dd8ab75e07fa5406ef37bcba5d..02614ebbb0436dc9056f986378aadd1b58e90a02 100644 (file)
--- 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 bd17e5d6e9dd243b21e256e1d9ee4e511886d34c..cb5bb3b852011c96feea38fda8ec28755af770bd 100644 (file)
--- 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 ee769d05fcf35e466d3bdf68c3a674003a009e4d..a3a0894e9e93d9ae0a07a09b42902323f5eb55c7 100644 (file)
--- 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 8a9860936249e689be1144d07eeaeb9ed97d42bd..08902d14fb3a3feb8f726d79c7e1bd46701bd51b 100644 (file)
--- 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);
 }