compiler/blob: Constify the reader

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/src/compiler/blob.c b/src/compiler/blob.c
index 5375c647b02edc0b412d260514eb176ce120f88d..5c94beed842f7273dbd95a212d7db404462f50ca 100644 (file)
--- a/src/compiler/blob.c
+++ b/src/compiler/blob.c
@@ -238,10 +238,10 @@ blob_write_string(struct blob *blob, const char *str)
 }
 
 void
-blob_reader_init(struct blob_reader *blob, uint8_t *data, size_t size)
+blob_reader_init(struct blob_reader *blob, const uint8_t *data, size_t size)
 {
    blob->data = data;
-   blob->end = data + size;
+   blob->end = blob->data + size;
    blob->current = data;
    blob->overrun = false;
 }
@@ -264,10 +264,10 @@ ensure_can_read(struct blob_reader *blob, size_t size)
    return false;
 }
 
-void *
+const void *
 blob_read_bytes(struct blob_reader *blob, size_t size)
 {
-   void *ret;
+   const void *ret;
 
    if (! ensure_can_read (blob, size))
       return NULL;
@@ -282,7 +282,7 @@ blob_read_bytes(struct blob_reader *blob, size_t size)
 void
 blob_copy_bytes(struct blob_reader *blob, uint8_t *dest, size_t size)
 {
-   uint8_t *bytes;
+   const uint8_t *bytes;
 
    bytes = blob_read_bytes(blob, size);
    if (bytes == NULL)

diff --git a/src/compiler/blob.h b/src/compiler/blob.h
index 62105c8ebd958c6e20b061ca4dfa875bf622d80e..e224dbbece08256ea8f42d086d23edda01c7c871 100644 (file)
--- a/src/compiler/blob.h
+++ b/src/compiler/blob.h
@@ -78,9 +78,9 @@ struct blob {
  *   2. blob->overrun should be false, (otherwise, too much was read).
  */
 struct blob_reader {
-   uint8_t *data;
-   uint8_t *end;
-   uint8_t *current;
+   const uint8_t *data;
+   const uint8_t *end;
+   const uint8_t *current;
    bool overrun;
 };
 
@@ -272,7 +272,7 @@ blob_write_string(struct blob *blob, const char *str);
  * current value is unchanged before and after the call.
  */
 void
-blob_reader_init(struct blob_reader *blob, uint8_t *data, size_t size);
+blob_reader_init(struct blob_reader *blob, const uint8_t *data, size_t size);
 
 /**
  * Read some unstructured, fixed-size data from the current location, (and
@@ -284,7 +284,7 @@ blob_reader_init(struct blob_reader *blob, uint8_t *data, size_t size);
  *
  * \return The bytes read (see note above about memory lifetime).
  */
-void *
+const void *
 blob_read_bytes(struct blob_reader *blob, size_t size);
 
 /**

diff --git a/src/compiler/glsl/tests/blob_test.c b/src/compiler/glsl/tests/blob_test.c
index 0b4955b6b689313a41013721d2e7c788ba70a2b4..1cc97236e7e64d1538aff547a87fffc0813741bb 100644 (file)
--- a/src/compiler/glsl/tests/blob_test.c
+++ b/src/compiler/glsl/tests/blob_test.c
@@ -83,7 +83,7 @@ expect_equal_str(const char *expected, const char *actual, const char *test)
 }
 
 static void
-expect_equal_bytes(uint8_t *expected, uint8_t *actual,
+expect_equal_bytes(uint8_t *expected, const uint8_t *actual,
                    size_t num_bytes, const char *test)
 {
    size_t i;