From d9516d3c5873e3b1b76e7b9611298635997e4cbc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 6 Aug 2014 13:58:22 +0100 Subject: [PATCH] bytereader: use unchecked inline variant for get_remaining in more places We've already done the g_return_*_if_fail (reader != NULL) dance in those places, so no need to do it again. --- libs/gst/base/gstbytereader.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/gst/base/gstbytereader.h b/libs/gst/base/gstbytereader.h index 7182d27..5b68837 100644 --- a/libs/gst/base/gstbytereader.h +++ b/libs/gst/base/gstbytereader.h @@ -461,7 +461,7 @@ _gst_byte_reader_dup_data_inline (GstByteReader * reader, guint size, guint8 ** g_return_val_if_fail (reader != NULL, FALSE); g_return_val_if_fail (val != NULL, FALSE); - if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size)) + if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_unchecked (reader) < size)) return FALSE; *val = gst_byte_reader_dup_data_unchecked (reader, size); @@ -474,7 +474,7 @@ _gst_byte_reader_get_data_inline (GstByteReader * reader, guint size, const guin g_return_val_if_fail (reader != NULL, FALSE); g_return_val_if_fail (val != NULL, FALSE); - if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size)) + if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_unchecked (reader) < size)) return FALSE; *val = gst_byte_reader_get_data_unchecked (reader, size); @@ -487,7 +487,7 @@ _gst_byte_reader_peek_data_inline (const GstByteReader * reader, guint size, con g_return_val_if_fail (reader != NULL, FALSE); g_return_val_if_fail (val != NULL, FALSE); - if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_inline (reader) < size)) + if (G_UNLIKELY (size > reader->size || _gst_byte_reader_get_remaining_unchecked (reader) < size)) return FALSE; *val = gst_byte_reader_peek_data_unchecked (reader); -- 2.7.4