X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_block_helper.h;h=4fe6e76985cb850d4fb8938eef809fe75bfcbc84;hb=62dd14548820fb0966e6b90d586183f74a427e4b;hp=034739f469203de23c988ec02c1d0e423412e306;hpb=f0251c53bd46a47a96563aece4054399c450f7ba;p=vlc

diff --git a/include/vlc_block_helper.h b/include/vlc_block_helper.h
index 034739f469..4fe6e76985 100644
--- a/include/vlc_block_helper.h
+++ b/include/vlc_block_helper.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_block_helper.h: Helper functions for data blocks management.
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -18,26 +18,26 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _VLC_BLOCK_HELPER_H
 #define _VLC_BLOCK_HELPER_H 1
 
+#include <vlc_block.h>
+
 typedef struct block_bytestream_t
 {
     block_t             *p_chain;
     block_t             *p_block;
-    int                 i_offset;
+    size_t              i_offset;
 
 } block_bytestream_t;
 
-#define block_BytestreamInit( a ) __block_BytestreamInit( VLC_OBJECT(a) )
-
 /*****************************************************************************
  * block_bytestream_t management
  *****************************************************************************/
-static inline block_bytestream_t __block_BytestreamInit( vlc_object_t *p_obj )
+static inline block_bytestream_t block_BytestreamInit( void )
 {
     block_bytestream_t bytestream;
 
@@ -210,10 +210,10 @@ static inline int block_GetByte( block_bytestream_t *p_bytestream,
 }
 
 static inline int block_WaitBytes( block_bytestream_t *p_bytestream,
-                                   int i_data )
+                                   size_t i_data )
 {
     block_t *p_block;
-    int i_offset, i_copy, i_size;
+    size_t i_offset, i_copy, i_size;
 
     /* Check we have that much data */
     i_offset = p_bytestream->i_offset;
@@ -238,10 +238,10 @@ static inline int block_WaitBytes( block_bytestream_t *p_bytestream,
 }
 
 static inline int block_SkipBytes( block_bytestream_t *p_bytestream,
-                                   int i_data )
+                                   size_t i_data )
 {
     block_t *p_block;
-    int i_offset, i_copy;
+    size_t i_offset, i_copy;
 
     /* Check we have that much data */
     i_offset = p_bytestream->i_offset;
@@ -269,10 +269,10 @@ static inline int block_SkipBytes( block_bytestream_t *p_bytestream,
 }
 
 static inline int block_PeekBytes( block_bytestream_t *p_bytestream,
-                                   uint8_t *p_data, int i_data )
+                                   uint8_t *p_data, size_t i_data )
 {
     block_t *p_block;
-    int i_offset, i_copy, i_size;
+    size_t i_offset, i_copy, i_size;
 
     /* Check we have that much data */
     i_offset = p_bytestream->i_offset;
@@ -319,10 +319,10 @@ static inline int block_PeekBytes( block_bytestream_t *p_bytestream,
 }
 
 static inline int block_GetBytes( block_bytestream_t *p_bytestream,
-                                  uint8_t *p_data, int i_data )
+                                  uint8_t *p_data, size_t i_data )
 {
     block_t *p_block;
-    int i_offset, i_copy, i_size;
+    size_t i_offset, i_copy, i_size;
 
     /* Check we have that much data */
     i_offset = p_bytestream->i_offset;
@@ -373,10 +373,10 @@ static inline int block_GetBytes( block_bytestream_t *p_bytestream,
 }
 
 static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream,
-    int i_peek_offset, uint8_t *p_data, int i_data )
+    size_t i_peek_offset, uint8_t *p_data, size_t i_data )
 {
     block_t *p_block;
-    int i_offset, i_copy, i_size;
+    size_t i_offset, i_copy, i_size;
 
     /* Check we have that much data */
     i_offset = p_bytestream->i_offset;
@@ -437,11 +437,12 @@ static inline int block_PeekOffsetBytes( block_bytestream_t *p_bytestream,
 }
 
 static inline int block_FindStartcodeFromOffset(
-    block_bytestream_t *p_bytestream, int *pi_offset,
+    block_bytestream_t *p_bytestream, size_t *pi_offset,
     uint8_t *p_startcode, int i_startcode_length )
 {
     block_t *p_block, *p_block_backup = 0;
-    int i_size, i_offset, i_offset_backup = 0;
+    int i_size = 0;
+    size_t i_offset, i_offset_backup = 0;
     int i_caller_offset_backup = 0, i_match;
 
     /* Find the right place */
@@ -462,7 +463,7 @@ static inline int block_FindStartcodeFromOffset(
     /* Begin the search.
      * We first look for an occurrence of the 1st startcode byte and
      * if found, we do a more thorough check. */
-    i_size = p_block->i_buffer + i_size;
+    i_size += p_block->i_buffer;
     *pi_offset -= i_size;
     i_match = 0;
     for( ; p_block != NULL; p_block = p_block->p_next )