Changeset d145ecb in mainline


Ignore:
Timestamp:
2020-09-21T14:02:42Z (4 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aaf962e6
Parents:
003c413
Message:

Libriff needs unit tests

Location:
uspace/lib
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/gfxfont/src/font.c

    r003c413 rd145ecb  
    375375                return rc;
    376376
    377         rc = riff_wchunk_write(riffw, (void *) props, sizeof(*props));
     377        rc = riff_write(riffw, (void *) props, sizeof(*props));
    378378        if (rc != EOK)
    379379                return rc;
    … …  
    402402                return rc;
    403403
    404         rc = riff_wchunk_write(riffw, (void *) metrics, sizeof(*metrics));
     404        rc = riff_write(riffw, (void *) metrics, sizeof(*metrics));
    405405        if (rc != EOK)
    406406                return rc;
    … …  
    445445                return rc;
    446446
    447         rc = riff_wchunk_write(riffw, (void *) alloc.pixels,
     447        rc = riff_write(riffw, (void *) alloc.pixels,
    448448            font->rect.p1.x * font->rect.p1.y * sizeof(uint32_t));
    449449        if (rc != EOK)

  • uspace/lib/gfxfont/src/glyph.c

    r003c413 rd145ecb  
    331331                return rc;
    332332
    333         rc = riff_wchunk_write(riffw, (void *) metrics, sizeof(*metrics));
     333        rc = riff_write(riffw, (void *) metrics, sizeof(*metrics));
    334334        if (rc != EOK)
    335335                return rc;
    … …  
    363363                str = gfx_glyph_pattern_str(pat);
    364364
    365                 rc = riff_wchunk_write(riffw, (void *) str, 1 + str_size(str));
     365                rc = riff_write(riffw, (void *) str, 1 + str_size(str));
    366366                if (rc != EOK)
    367367                        return rc;
    … …  
    393393                return rc;
    394394
    395         rc = riff_wchunk_write(riffw, (void *) &glyph->rect,
    396             sizeof(glyph->rect));
    397         if (rc != EOK)
    398                 return rc;
    399 
    400         rc = riff_wchunk_write(riffw, (void *) &glyph->origin,
    401             sizeof(glyph->origin));
     395        rc = riff_write(riffw, (void *) &glyph->rect, sizeof(glyph->rect));
     396        if (rc != EOK)
     397                return rc;
     398
     399        rc = riff_write(riffw, (void *) &glyph->origin, sizeof(glyph->origin));
    402400        if (rc != EOK)
    403401                return rc;

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

    r003c413 rd145ecb  
    4545extern errno_t riff_wchunk_start(riffw_t *, riff_ckid_t, riff_wchunk_t *);
    4646extern errno_t riff_wchunk_end(riffw_t *, riff_wchunk_t *);
    47 extern errno_t riff_wchunk_write(riffw_t *, void *, size_t);
     47extern errno_t riff_write(riffw_t *, void *, size_t);
    4848extern errno_t riff_write_uint32(riffw_t *, uint32_t);
    4949
    … …  
    5454extern errno_t riff_rchunk_end(riff_rchunk_t *);
    5555extern errno_t riff_read(riff_rchunk_t *, void *, size_t, size_t *);
     56extern uint32_t riff_rchunk_size(riff_rchunk_t *);
    5657
    5758#endif

  • uspace/lib/riff/meson.build

    r003c413 rd145ecb  
    3131        'src/rwave.c',
    3232)
     33
     34test_src = files(
     35        'test/chunk.c',
     36        'test/main.c',
     37        'test/rwave.c',
     38)

  • uspace/lib/riff/src/chunk.c

    r003c413 rd145ecb  
    152152
    153153        cksize = pos - wchunk->ckstart;
     154        if (pos % 2 != 0)
     155                ++pos;
    154156
    155157        if (fseek(rw->f, wchunk->ckstart - 4, SEEK_SET) < 0)
    … …  
    176178 * @return EOK on success, EIO on error.
    177179 */
    178 errno_t riff_wchunk_write(riffw_t *rw, void *data, size_t bytes)
     180errno_t riff_write(riffw_t *rw, void *data, size_t bytes)
    179181{
    180182        size_t nw;
    … …  
    281283                return rc;
    282284
     285        if (nread != sizeof(vle))
     286                return ELIMIT;
     287
    283288        *v = uint32_t_le2host(vle);
    284289        return EOK;
    … …  
    315320error:
    316321        return rc;
     322}
     323
     324/** Return chunk data size.
     325 *
     326 * @param rchunk RIFF chunk
     327 * @return Pure data size (excluding type+size header) in bytes
     328 */
     329uint32_t riff_rchunk_size(riff_rchunk_t *rchunk)
     330{
     331        return rchunk->cksize;
    317332}
    318333

  • uspace/lib/riff/src/rwave.c

    r003c413 rd145ecb  
    137137                goto error;
    138138
    139         rc = riff_wchunk_write(ww->rw, &rwfmt, sizeof(rwfmt));
     139        rc = riff_write(ww->rw, &rwfmt, sizeof(rwfmt));
    140140        if (rc != EOK)
    141141                goto error;
    … …  
    196196                }
    197197
    198                 rc = riff_wchunk_write(ww->rw, ww->buf, now);
     198                rc = riff_write(ww->rw, ww->buf, now);
    199199                if (rc != EOK) {
    200200                        assert(rc == EIO);
Note: See TracChangeset for help on using the changeset viewer.