util/build-id: Return a pointer rather than copying the data

We're about to use the build-id as the starting point for another SHA1
hash in the Intel Vulkan driver, and returning a pointer is far more
convenient.

Reviewed-by: Chad Versace <chadversary@chromium.org>

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 238e149a3d1f0aec313642abdfecc818445456f4..9b9355c2ff0302475a703b0d7fbf37bad51edbb8 100644 (file)
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -63,7 +63,7 @@ anv_device_get_cache_uuid(void *uuid)
    if (len < VK_UUID_SIZE)
       return false;
 
-   build_id_read(note, uuid, VK_UUID_SIZE);
+   memcpy(uuid, build_id_data(note), VK_UUID_SIZE);
    return true;
 }
 

diff --git a/src/util/build_id.c b/src/util/build_id.c
index cc0f852730289dbc5259aaf7968e9da7a7aef8db..c53e71ddfd1b07a656f804739178743f15bb8636 100644 (file)
--- a/src/util/build_id.c
+++ b/src/util/build_id.c
@@ -107,11 +107,10 @@ build_id_length(const struct build_id_note *note)
    return note->nhdr.n_descsz;
 }
 
-void
-build_id_read(const struct build_id_note *note,
-              unsigned char *build_id, size_t n)
+const uint8_t *
+build_id_data(const struct build_id_note *note)
 {
-   memcpy(build_id, note->build_id, n);
+   return note->build_id;
 }
 
 #endif

diff --git a/src/util/build_id.h b/src/util/build_id.h
index 39bf9b016fdeaa050b57ec230a267669830e2693..551ac6989bc061edfe615e1b4a3158648f6799b5 100644 (file)
--- a/src/util/build_id.h
+++ b/src/util/build_id.h
@@ -31,8 +31,7 @@ build_id_find_nhdr(const char *filename);
 unsigned
 build_id_length(const struct build_id_note *note);
 
-void
-build_id_read(const struct build_id_note *note,
-              unsigned char *build_id, size_t n);
+const uint8_t *
+build_id_data(const struct build_id_note *note);
 
 #endif