Changeset 003c413 in mainline for uspace/lib/riff/include


Ignore:
Timestamp:
2020-09-19T18:55:28Z (5 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d145ecb
Parents:
0ee3157
Message:

RIFF reader should heed parent chunk bounds when starting child chunk

Location:
uspace/lib/riff/include
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/riff/include/riff/chunk.h

    r0ee3157 r003c413  
    4848extern errno_t riff_write_uint32(riffw_t *, uint32_t);
    4949
    50 extern errno_t riff_ropen(const char *, riffr_t **);
     50extern errno_t riff_ropen(const char *, riff_rchunk_t *, riffr_t **);
    5151extern errno_t riff_rclose(riffr_t *);
    52 extern errno_t riff_read_uint32(riffr_t *, uint32_t *);
    53 extern errno_t riff_rchunk_start(riffr_t *, riff_rchunk_t *);
    54 extern errno_t riff_rchunk_end(riffr_t *, riff_rchunk_t *);
    55 extern errno_t riff_rchunk_read(riffr_t *, riff_rchunk_t *, void *, size_t,
    56     size_t *);
     52extern errno_t riff_read_uint32(riff_rchunk_t *, uint32_t *);
     53extern errno_t riff_rchunk_start(riff_rchunk_t *, riff_rchunk_t *);
     54extern errno_t riff_rchunk_end(riff_rchunk_t *);
     55extern errno_t riff_read(riff_rchunk_t *, void *, size_t, size_t *);
    5756
    5857#endif

  • uspace/lib/riff/include/types/riff/chunk.h

    r0ee3157 r003c413  
    4343typedef uint32_t riff_cksize_t;
    4444
     45/** RIFF writer */
     46typedef struct {
     47        FILE *f;
     48        /** Chunk start offset */
     49        long ckstart;
     50} riffw_t;
     51
     52/** RIFF reader */
     53typedef struct {
     54        FILE *f;
     55} riffr_t;
     56
    4557/** RIFF chunk for reading */
    4658typedef struct {
     59        riffr_t *riffr;
    4760        long ckstart;
    4861        riff_ckid_t ckid;
    … …  
    6174        riff_cksize_t cksize;
    6275} riff_ckinfo_t;
    63 
    64 /** RIFF writer */
    65 typedef struct {
    66         FILE *f;
    67         /** Chunk start offset */
    68         long ckstart;
    69 } riffw_t;
    70 
    71 /** RIFF reader */
    72 typedef struct {
    73         FILE *f;
    74 } riffr_t;
    7576
    7677enum {
Note: See TracChangeset for help on using the changeset viewer.