Rename helper functions, as suggested in review

diff --git a/src/ccache.c b/src/ccache.c
index 6aac782c5fec1794eed2f2d5d5b43fa751be0561..3cf5d38219791182f7bff894b10a5e23b9e63028 100644 (file)
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -491,7 +491,7 @@ debug_end()
 {
        hash_debug_end();
        char *path = format("%s%s", output_obj, ".ccache-log");
-       cc_copylog(path);
+       cc_dump_log_buffer(path);
        free(path);
 }
 

diff --git a/src/ccache.h b/src/ccache.h
index a767ef323da9349171a1c030d3262f8eae4ad67e..40b8a1ef29de5e7b6aab3591519c52eeda1a1a16 100644 (file)
--- a/src/ccache.h
+++ b/src/ccache.h
@@ -139,7 +139,7 @@ bool hash_file(struct mdfour *md, const char *fname);
 void cc_log(const char *format, ...) ATTR_FORMAT(printf, 1, 2);
 void cc_bulklog(const char *format, ...) ATTR_FORMAT(printf, 1, 2);
 void cc_log_argv(const char *prefix, char **argv);
-bool cc_copylog(const char *path);
+bool cc_dump_log_buffer(const char *path);
 void fatal(const char *format, ...) ATTR_FORMAT(printf, 1, 2) ATTR_NORETURN;
 void warn(const char *format, ...) ATTR_FORMAT(printf, 1, 2);
 
@@ -247,7 +247,7 @@ void wipe_all(struct conf *conf);
 int execute(char **argv, int fd_out, int fd_err, pid_t *pid);
 char *find_executable(const char *name, const char *exclude_name);
 void print_command(FILE *fp, char **argv);
-char *string_command(char **argv);
+char *format_command(char **argv);
 
 // ----------------------------------------------------------------------------
 // lockfile.c

diff --git a/src/execute.c b/src/execute.c
index 4589a477f489ad15e6816b47cc7c024f2c5c5b81..e56526f175c8890ef5e9b0d3a8f926b430e9cb4a 100644 (file)
--- a/src/execute.c
+++ b/src/execute.c
@@ -350,7 +350,7 @@ print_command(FILE *fp, char **argv)
 }
 
 char *
-string_command(char **argv)
+format_command(char **argv)
 {
        size_t len = 0;
        for (int i = 0; argv[i]; i++) {

diff --git a/src/util.c b/src/util.c
index b297e24e6392bca059da815d741e73aadbf004d2..d9143cea4211de153738f1b4cb9ce55c84c7a5f3 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -200,7 +200,7 @@ cc_log_argv(const char *prefix, char **argv)
                }
        }
        if (logbuffer) {
-               char *s = string_command(argv);
+               char *s = format_command(argv);
                append_log(s, strlen(s));
                free(s);
        }
@@ -208,7 +208,7 @@ cc_log_argv(const char *prefix, char **argv)
 
 // Copy the current log memory buffer to an output file.
 bool
-cc_copylog(const char *path)
+cc_dump_log_buffer(const char *path)
 {
        FILE *file = fopen(path, "w");
        fwrite(logbuffer, 1, logsize, file);

diff --git a/unittest/test_util.c b/unittest/test_util.c
index 4fed42ccd59dcd195341a06f39951f3c73229a0f..ae178e2adc35d1fea0b63b6d3f61a89b877b797c 100644 (file)
--- a/unittest/test_util.c
+++ b/unittest/test_util.c
@@ -199,11 +199,11 @@ TEST(parse_size_with_suffix)
        }
 }
 
-TEST(string_command)
+TEST(format_command)
 {
        char *argv[] = {"foo", "bar", NULL};
 
-       CHECK_STR_EQ_FREE2("foo bar\n", string_command(argv));
+       CHECK_STR_EQ_FREE2("foo bar\n", format_command(argv));
 
 }