Changeset 0ee3157 in mainline

Timestamp:

2020-09-18T23:09:04Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

003c413

Parents:

d53af3c8

Message:

Use errno_t for error values in libriff

Location:

uspace/lib/riff

Files:

• include/riff/chunk.h (modified) (1 diff)
• include/riff/rwave.h (modified) (1 diff)
• src/chunk.c (modified) (12 diffs)
• src/rwave.c (modified) (7 diffs)

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

@@ -37 +37 @@
 #define RIFF_CHUNK_H
 
+#include <errno.h>
 #include <stddef.h>
 #include <types/riff/chunk.h>
 
-extern int riff_wopen(const char *, riffw_t **);
-extern int riff_wclose(riffw_t *);
-extern int riff_wchunk_start(riffw_t *, riff_ckid_t, riff_wchunk_t *);
-extern int riff_wchunk_end(riffw_t *, riff_wchunk_t *);
-extern int riff_wchunk_write(riffw_t *, void *, size_t);
-extern int riff_write_uint32(riffw_t *, uint32_t);
+extern errno_t riff_wopen(const char *, riffw_t **);
+extern errno_t riff_wclose(riffw_t *);
+extern errno_t riff_wchunk_start(riffw_t *, riff_ckid_t, riff_wchunk_t *);
+extern errno_t riff_wchunk_end(riffw_t *, riff_wchunk_t *);
+extern errno_t riff_wchunk_write(riffw_t *, void *, size_t);
+extern errno_t riff_write_uint32(riffw_t *, uint32_t);
 
-extern int riff_ropen(const char *, riffr_t **);
-extern int riff_rclose(riffr_t *);
-extern int riff_read_uint32(riffr_t *, uint32_t *);
-extern int riff_rchunk_start(riffr_t *, riff_rchunk_t *);
-extern int riff_rchunk_end(riffr_t *, riff_rchunk_t *);
-extern int riff_rchunk_read(riffr_t *, riff_rchunk_t *, void *, size_t,
+extern errno_t riff_ropen(const char *, riffr_t **);
+extern errno_t riff_rclose(riffr_t *);
+extern errno_t riff_read_uint32(riffr_t *, uint32_t *);
+extern errno_t riff_rchunk_start(riffr_t *, riff_rchunk_t *);
+extern errno_t riff_rchunk_end(riffr_t *, riff_rchunk_t *);
+extern errno_t riff_rchunk_read(riffr_t *, riff_rchunk_t *, void *, size_t,
     size_t *);
 

uspace/lib/riff/include/riff/rwave.h

@@ -37 +37 @@
 #define RIFF_WAVE_H
 
+#include <errno.h>
 #include <types/riff/rwave.h>
 
-extern int rwave_wopen(const char *, rwave_params_t *params, rwavew_t **);
-extern int rwave_write_samples(rwavew_t *, void *, size_t);
-extern int rwave_wclose(rwavew_t *);
+extern errno_t rwave_wopen(const char *, rwave_params_t *params, rwavew_t **);
+extern errno_t rwave_write_samples(rwavew_t *, void *, size_t);
+extern errno_t rwave_wclose(rwavew_t *);
 
-extern int rwave_ropen(const char *, rwave_params_t *params, rwaver_t **);
-extern int rwave_read_samples(rwaver_t *, void *, size_t, size_t *);
-extern int rwave_rclose(rwaver_t *);
+extern errno_t rwave_ropen(const char *, rwave_params_t *params, rwaver_t **);
+extern errno_t rwave_read_samples(rwaver_t *, void *, size_t, size_t *);
+extern errno_t rwave_rclose(rwaver_t *);
 
 #endif

uspace/lib/riff/src/chunk.c

@@ -49 +49 @@
  *         file.
  */
-int riff_wopen(const char *fname, riffw_t **rrw)
+errno_t riff_wopen(const char *fname, riffw_t **rrw)
 {
         riffw_t *rw;
@@ -73 +73 @@
  *         is destroyed anyway.
  */
-int riff_wclose(riffw_t *rw)
+errno_t riff_wclose(riffw_t *rw)
 {
         int rv;
@@ -89 +89 @@
  * @return EOK on success, EIO on error.
  */
-int riff_write_uint32(riffw_t *rw, uint32_t v)
+errno_t riff_write_uint32(riffw_t *rw, uint32_t v)
 {
         uint32_t vle;
@@ -108 +108 @@
  * @return EOK on success, EIO on write error
  */
-int riff_wchunk_start(riffw_t *rw, riff_ckid_t ckid, riff_wchunk_t *wchunk)
+errno_t riff_wchunk_start(riffw_t *rw, riff_ckid_t ckid, riff_wchunk_t *wchunk)
 {
         long pos;
-        int rc;
+        errno_t rc;
 
         pos = ftell(rw->f);
@@ -141 +141 @@
  * @return EOK on success, EIO error.
  */
-int riff_wchunk_end(riffw_t *rw, riff_wchunk_t *wchunk)
+errno_t riff_wchunk_end(riffw_t *rw, riff_wchunk_t *wchunk)
 {
         long pos;
         long cksize;
-        int rc;
+        errno_t rc;
 
         pos = ftell(rw->f);
@@ -176 +176 @@
  * @return EOK on success, EIO on error.
  */
-int riff_wchunk_write(riffw_t *rw, void *data, size_t bytes)
+errno_t riff_wchunk_write(riffw_t *rw, void *data, size_t bytes)
 {
         size_t nw;
@@ -195 +195 @@
  *         file..
  */
-int riff_ropen(const char *fname, riffr_t **rrr)
+errno_t riff_ropen(const char *fname, riffr_t **rrr)
 {
         riffr_t *rr;
-        int rc;
+        errno_t rc;
 
         rr = calloc(1, sizeof(riffr_t));
@@ -226 +226 @@
  * @return EOK on success, EIO on error.
  */
-int riff_rclose(riffr_t *rr)
-{
-        int rc;
+errno_t riff_rclose(riffr_t *rr)
+{
+        errno_t rc;
 
         rc = fclose(rr->f);
@@ -241 +241 @@
  * @return EOK on success, EIO on error.
  */
-int riff_read_uint32(riffr_t *rr, uint32_t *v)
+errno_t riff_read_uint32(riffr_t *rr, uint32_t *v)
 {
         uint32_t vle;
@@ -259 +259 @@
  * @return EOK on success, EIO on error.
  */
-int riff_rchunk_start(riffr_t *rr, riff_rchunk_t *rchunk)
-{
-        int rc;
+errno_t riff_rchunk_start(riffr_t *rr, riff_rchunk_t *rchunk)
+{
+        errno_t rc;
         long pos;
 
@@ -317 +317 @@
  * @return EOK on success, EIO on error.
  */
-int riff_rchunk_end(riffr_t *rr, riff_rchunk_t *rchunk)
+errno_t riff_rchunk_end(riffr_t *rr, riff_rchunk_t *rchunk)
 {
         long ckend;
@@ -343 +343 @@
  *         EIO on I/O error.
  */
-int riff_rchunk_read(riffr_t *rr, riff_rchunk_t *rchunk, void *buf,
+errno_t riff_rchunk_read(riffr_t *rr, riff_rchunk_t *rchunk, void *buf,
     size_t bytes, size_t *nread)
 {

uspace/lib/riff/src/rwave.c

@@ -94 +94 @@
  * @return EOK on success, EIO on I/O error, ENOMEM if out of memory.
  */
-int rwave_wopen(const char *fname, rwave_params_t *params, rwavew_t **rww)
+errno_t rwave_wopen(const char *fname, rwave_params_t *params, rwavew_t **rww)
 {
         riff_wchunk_t fmt;
         rwave_fmt_t rwfmt;
-        int rc;
+        errno_t rc;
         rwavew_t *ww;
 
@@ -169 +169 @@
  *         not supported.
  */
-int rwave_write_samples(rwavew_t *ww, void *data, size_t bytes)
+errno_t rwave_write_samples(rwavew_t *ww, void *data, size_t bytes)
 {
         size_t i;
         uint16_t *d16, *b16;
         size_t now;
-        int rc;
+        errno_t rc;
 
         /* Convert sample data to little endian */
@@ -215 +215 @@
  *         anyway.
  */
-int rwave_wclose(rwavew_t *ww)
-{
-        int rc;
+errno_t rwave_wclose(rwavew_t *ww)
+{
+        errno_t rc;
 
         rc = riff_wchunk_end(ww->rw, &ww->wave);
@@ -240 +240 @@
  * @return EOK on success, EIO on I/O error, ENOMEM if out of memory
  */
-int rwave_ropen(const char *fname, rwave_params_t *params, rwaver_t **rwr)
+errno_t rwave_ropen(const char *fname, rwave_params_t *params, rwaver_t **rwr)
 {
         rwaver_t *wr = NULL;
@@ -247 +247 @@
         rwave_fmt_t wfmt;
         size_t nread;
-        int rc;
+        errno_t rc;
 
         wr = calloc(1, sizeof(rwaver_t));
@@ -349 +349 @@
  *         EIO on I/O error.
  */
-int rwave_read_samples(rwaver_t *wr, void *buf, size_t bytes, size_t *nread)
-{
-        int rc;
+errno_t rwave_read_samples(rwaver_t *wr, void *buf, size_t bytes, size_t *nread)
+{
+        errno_t rc;
 
         rc = riff_rchunk_read(wr->rr, &wr->data, buf, bytes, nread);
@@ -369 +369 @@
  *         anyway.
  */
-int rwave_rclose(rwaver_t *wr)
-{
-        int rc;
+errno_t rwave_rclose(rwaver_t *wr)
+{
+        errno_t rc;
 
         rc = riff_rchunk_end(wr->rr, &wr->wave);