Make format_file_hash public by moving it to util.c (as format_hash_as_string)

diff --git a/ccache.c b/ccache.c
index 883493801ae1d74ed4f2e8af90abc5c7a3ef34b3..3b656d5eb238501222c40e0eaa01c769195f3e96 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -266,20 +266,6 @@ static void failed(void)
        exit(1);
 }
 
-static char *format_file_hash(struct file_hash *file_hash)
-{
-       char *ret;
-       int i;
-
-       ret = x_malloc(53);
-       for (i = 0; i < 16; i++) {
-               sprintf(&ret[i*2], "%02x", (unsigned)file_hash->hash[i]);
-       }
-       sprintf(&ret[i*2], "-%u", (unsigned)file_hash->size);
-
-       return ret;
-}
-
 /*
  * Transform a name to a full path into the cache directory, creating needed
  * sublevels if needed. Caller frees.
@@ -906,7 +892,7 @@ static int find_hash(ARGS *args, enum findhash_call_mode mode)
                break;
        }
 
-       object_name = format_file_hash(object_hash);
+       object_name = format_hash_as_string(object_hash->hash, object_hash->size);
        cached_obj = get_path_in_cache(object_name, ".o");
        cached_stderr = get_path_in_cache(object_name, ".stderr");
        cached_dep = get_path_in_cache(object_name, ".d");

diff --git a/ccache.h b/ccache.h
index f85b7c3252b45203c6c1da3624d70fbab3382bd5..7a721fe4b26140d21c7642bc5c7c8b4af9e5e07b 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -72,6 +72,7 @@ int test_if_compressed(const char *filename);
 
 int create_dir(const char *dir);
 const char *tmp_string(void);
+char *format_hash_as_string(const unsigned char *hash, unsigned size);
 int create_hash_dir(char **dir, const char *hash, const char *cache_dir);
 int create_cachedirtag(const char *dir);
 void x_asprintf(char **ptr, const char *format, ...) ATTR_FORMAT(printf, 2, 3);

diff --git a/util.c b/util.c
index 56deaacd8ee219071f50d4186bd07812651b5f5d..abd094c7cb7e9a980fbb2a529ccbe8ad7bca2ff9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -292,6 +292,20 @@ const char *tmp_string(void)
        return ret;
 }
 
+char *format_hash_as_string(const unsigned char *hash, unsigned size)
+{
+       char *ret;
+       int i;
+
+       ret = x_malloc(53);
+       for (i = 0; i < 16; i++) {
+               sprintf(&ret[i*2], "%02x", (unsigned) hash[i]);
+       }
+       sprintf(&ret[i*2], "-%u", size);
+
+       return ret;
+}
+
 char const CACHEDIR_TAG[] =
        "Signature: 8a477f597d28d172789f06886806bc55\n"
        "# This file is a cache directory tag created by ccache.\n"