commit 9f89df970fb2b03fde917cafb384216453df2928
author Wan-Teh Chang <wtc@google.com> Wed Jul 08 18:54:26 2020 -0700
committer Joe Drago <joedrago@gmail.com> Wed Jul 08 19:05:41 2020 -0700
tree 36e3cf70e2dd38d20862ea7c2608758ef6c74c5e
parent 8557cd60ab37f8285b26a686aa67883823365d16

Declare some stream functions to take const param

Declare some stream functions to take a const stream pointer parameter.
This helps code analysis.

include/avif/internal.h

diff --git a/include/avif/internal.h b/include/avif/internal.h
index 4ebbc1e..7a887ab 100644
--- a/include/avif/internal.h
+++ b/include/avif/internal.h
@@ -185,11 +185,11 @@
 
 const uint8_t * avifROStreamCurrent(avifROStream * stream);
 void avifROStreamStart(avifROStream * stream, avifROData * raw);
-size_t avifROStreamOffset(avifROStream * stream);
+size_t avifROStreamOffset(const avifROStream * stream);
 void avifROStreamSetOffset(avifROStream * stream, size_t offset);
 
-avifBool avifROStreamHasBytesLeft(avifROStream * stream, size_t byteCount);
-size_t avifROStreamRemainingBytes(avifROStream * stream);
+avifBool avifROStreamHasBytesLeft(const avifROStream * stream, size_t byteCount);
+size_t avifROStreamRemainingBytes(const avifROStream * stream);
 avifBool avifROStreamSkip(avifROStream * stream, size_t byteCount);
 avifBool avifROStreamRead(avifROStream * stream, uint8_t * data, size_t size);
 avifBool avifROStreamReadU16(avifROStream * stream, uint16_t * v);
@@ -209,7 +209,7 @@
 
 uint8_t * avifRWStreamCurrent(avifRWStream * stream);
 void avifRWStreamStart(avifRWStream * stream, avifRWData * raw);
-size_t avifRWStreamOffset(avifRWStream * stream);
+size_t avifRWStreamOffset(const avifRWStream * stream);
 void avifRWStreamSetOffset(avifRWStream * stream, size_t offset);
 
 void avifRWStreamFinishWrite(avifRWStream * stream);

src/stream.c

diff --git a/src/stream.c b/src/stream.c
index 30402a5..3270061 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -20,17 +20,17 @@
     stream->offset = 0;
 }
 
-avifBool avifROStreamHasBytesLeft(avifROStream * stream, size_t byteCount)
+avifBool avifROStreamHasBytesLeft(const avifROStream * stream, size_t byteCount)
 {
     return (stream->offset + byteCount) <= stream->raw->size;
 }
 
-size_t avifROStreamRemainingBytes(avifROStream * stream)
+size_t avifROStreamRemainingBytes(const avifROStream * stream)
 {
     return stream->raw->size - stream->offset;
 }
 
-size_t avifROStreamOffset(avifROStream * stream)
+size_t avifROStreamOffset(const avifROStream * stream)
 {
     return stream->offset;
 }
@@ -215,7 +215,7 @@
     stream->offset = 0;
 }
 
-size_t avifRWStreamOffset(avifRWStream * stream)
+size_t avifRWStreamOffset(const avifRWStream * stream)
 {
     return stream->offset;
 }

src/write.c

diff --git a/src/write.c b/src/write.c
index 4771ae0..d804be3 100644
--- a/src/write.c
+++ b/src/write.c
@@ -155,7 +155,7 @@
     avifFree(data);
 }
 
-static void avifEncoderItemAddMdatFixup(avifEncoderItem * item, avifRWStream * s)
+static void avifEncoderItemAddMdatFixup(avifEncoderItem * item, const avifRWStream * s)
 {
     avifOffsetFixup * fixup = (avifOffsetFixup *)avifArrayPushPtr(&item->mdatFixups);
     fixup->offset = avifRWStreamOffset(s);