Rename “filelist” to “result_files”

diff --git a/src/ccache.c b/src/ccache.c
index 3096e640d01cdcc547e0e7e22ef16fe6cd9858d5..ad32278efbb25bc95d92c66c67564a50d01a0e15 100644 (file)
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -1379,30 +1379,30 @@ to_cache(struct args *args, struct hash *depend_mode_hash)
                stats_update(STATS_ERROR);
                failed();
        }
-       struct filelist *filelist = filelist_init();
+       struct result_files *result_files = result_files_init();
        if (st.st_size > 0) {
-               filelist_add(filelist, tmp_stderr, "stderr");
+               result_files_add(result_files, tmp_stderr, "stderr");
        }
-       filelist_add(filelist, output_obj, ".o");
+       result_files_add(result_files, output_obj, ".o");
        if (generating_dependencies) {
-               filelist_add(filelist, output_dep, ".d");
+               result_files_add(result_files, output_dep, ".d");
        }
        if (generating_coverage) {
-               filelist_add(filelist, output_cov, ".gcno");
+               result_files_add(result_files, output_cov, ".gcno");
        }
        if (generating_stackusage) {
-               filelist_add(filelist, output_su, ".su");
+               result_files_add(result_files, output_su, ".su");
        }
        if (generating_diagnostics) {
-               filelist_add(filelist, output_dia, ".dia");
+               result_files_add(result_files, output_dia, ".dia");
        }
        if (using_split_dwarf) {
-               filelist_add(filelist, output_dwo, ".dwo");
+               result_files_add(result_files, output_dwo, ".dwo");
        }
        struct stat orig_dest_st;
        bool orig_dest_existed = stat(cached_result, &orig_dest_st) == 0;
-       result_put(cached_result, filelist);
-       filelist_free(filelist);
+       result_put(cached_result, result_files);
+       result_files_free(result_files);
 
        cc_log("Stored in cache: %s", cached_result);
 
@@ -2132,28 +2132,28 @@ from_cache(enum fromcache_call_mode mode, bool put_result_in_manifest)
        int tmp_stderr_fd = create_tmp_fd(&tmp_stderr);
        close(tmp_stderr_fd);
 
-       struct filelist *filelist = filelist_init();
+       struct result_files *result_files = result_files_init();
        if (!str_eq(output_obj, "/dev/null")) {
-               filelist_add(filelist, output_obj, ".o");
+               result_files_add(result_files, output_obj, ".o");
                if (using_split_dwarf) {
-                       filelist_add(filelist, output_dwo, ".dwo");
+                       result_files_add(result_files, output_dwo, ".dwo");
                }
        }
-       filelist_add(filelist, tmp_stderr, "stderr");
+       result_files_add(result_files, tmp_stderr, "stderr");
        if (produce_dep_file) {
-               filelist_add(filelist, output_dep, ".d");
+               result_files_add(result_files, output_dep, ".d");
        }
        if (generating_coverage) {
-               filelist_add(filelist, output_cov, ".gcno");
+               result_files_add(result_files, output_cov, ".gcno");
        }
        if (generating_stackusage) {
-               filelist_add(filelist, output_su, ".su");
+               result_files_add(result_files, output_su, ".su");
        }
        if (generating_diagnostics) {
-               filelist_add(filelist, output_dia, ".dia");
+               result_files_add(result_files, output_dia, ".dia");
        }
-       bool ok = result_get(cached_result, filelist);
-       filelist_free(filelist);
+       bool ok = result_get(cached_result, result_files);
+       result_files_free(result_files);
        if (!ok) {
                cc_log("Failed to get result from cache");
                // TODO: Add new STATS_CORRUPT statistics value and increment here?

diff --git a/src/result.c b/src/result.c
index b5ef3261f0c2efbcfa90d6d7b1aeb8e8da069be5..607794e82a8c88e4b7ae001f0c0cb2a3285d3419 100644 (file)
--- a/src/result.c
+++ b/src/result.c
@@ -74,22 +74,22 @@ enum {
        REF_MARKER = 1
 };
 
-struct file {
+struct result_file {
        char *suffix;
        char *path;
        uint64_t size;
 };
 
-struct filelist {
+struct result_files {
        uint32_t n_files;
-       struct file *files;
+       struct result_file *files;
        uint64_t *sizes;
 };
 
-struct filelist *
-filelist_init(void)
+struct result_files *
+result_files_init(void)
 {
-       struct filelist *list = x_malloc(sizeof(*list));
+       struct result_files *list = x_malloc(sizeof(*list));
        list->n_files = 0;
        list->files = NULL;
        list->sizes = NULL;
@@ -98,12 +98,12 @@ filelist_init(void)
 }
 
 void
-filelist_add(struct filelist *list, const char *path, const char *suffix)
+result_files_add(struct result_files *list, const char *path, const char *suffix)
 {
        uint32_t n = list->n_files;
        list->files = x_realloc(list->files, (n + 1) * sizeof(*list->files));
        list->sizes = x_realloc(list->sizes, (n + 1) * sizeof(*list->sizes));
-       struct file *f = &list->files[list->n_files];
+       struct result_file *f = &list->files[list->n_files];
        list->n_files++;
 
        struct stat st;
@@ -115,7 +115,7 @@ filelist_add(struct filelist *list, const char *path, const char *suffix)
 }
 
 void
-filelist_free(struct filelist *list)
+result_files_free(struct result_files *list)
 {
        for (uint32_t i = 0; i < list->n_files; i++) {
                free(list->files[i].suffix);
@@ -151,7 +151,10 @@ filelist_free(struct filelist *list)
 
 static bool
 read_result(
-       const char *path, struct filelist *list, FILE *dump_stream, char **errmsg)
+       const char *path,
+       struct result_files *list,
+       FILE *dump_stream,
+       char **errmsg)
 {
        *errmsg = NULL;
        bool success = false;
@@ -364,7 +367,7 @@ out:
 
 static bool
 write_result(
-       const struct filelist *list,
+       const struct result_files *list,
        struct compressor *compressor,
        struct compr_state *compr_state)
 {
@@ -401,7 +404,7 @@ error:
        return false;
 }
 
-bool result_get(const char *path, struct filelist *list)
+bool result_get(const char *path, struct result_files *list)
 {
        cc_log("Getting result %s", path);
 
@@ -418,7 +421,7 @@ bool result_get(const char *path, struct filelist *list)
        return success;
 }
 
-bool result_put(const char *path, struct filelist *list)
+bool result_put(const char *path, struct result_files *list)
 {
        bool ret = false;
        char *tmp_file = format("%s.tmp", path);

diff --git a/src/result.h b/src/result.h
index e6443320d55b918f1718210c05d76df055f2dfbb..be7638e471eebe9f09beae8002dcb2e8115f663b 100644 (file)
--- a/src/result.h
+++ b/src/result.h
@@ -5,12 +5,15 @@
 
 #define RESULT_VERSION 1
 
-struct filelist *filelist_init(void);
-void filelist_add(struct filelist *c, const char *path, const char *suffix);
-void filelist_free(struct filelist *c);
+struct result_files;
 
-bool result_get(const char *path, struct filelist *list);
-bool result_put(const char *path, struct filelist *list);
+struct result_files *result_files_init(void);
+void result_files_add(
+       struct result_files *c, const char *path, const char *suffix);
+void result_files_free(struct result_files *c);
+
+bool result_get(const char *path, struct result_files *list);
+bool result_put(const char *path, struct result_files *list);
 bool result_dump(const char *path, FILE *stream);
 
 #endif