aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-12-04 14:46:31 -05:00
Code

Feature: Updated error handling in igloo_io_{read,peek,write}()

Browse Source
This commit is contained in:
Philipp Schafft 2019-10-03 11:12:27 +00:00
parent ed52c31b11
commit df931bd9b8
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/io.c
View File

@ -64,20 +64,25 @@ ssize_t igloo_io_ ## x (igloo_io_t *io, void *buffer, size_t len, igloo_error_t
ssize_t ret = -1; \ ssize_t ret = -1; \
igloo_error_t error_store; \ igloo_error_t error_store; \
\ \
if (!io || !buffer) \ if (!error) \
error = &error_store; \
\
if (!io || !buffer) {\
*error = igloo_ERROR_FAULT; \
return -1; \ return -1; \
} \
\ \
if (!len) \ if (!len) \
return 0; \ return 0; \
\
if (!error) \
error = &error_store; \
\ \
igloo_thread_mutex_lock(&(io->lock)); \ igloo_thread_mutex_lock(&(io->lock)); \
io->touched = 1; \ io->touched = 1; \
\ \
if (io->ifdesc->x) \ if (io->ifdesc->x) {\
ret = io->ifdesc->x(igloo_INTERFACE_BASIC_CALL(io), buffer, len, error); \ ret = io->ifdesc->x(igloo_INTERFACE_BASIC_CALL(io), buffer, len, error); \
} else { \
*error = igloo_ERROR_GENERIC; \
} \
igloo_thread_mutex_unlock(&(io->lock)); \ igloo_thread_mutex_unlock(&(io->lock)); \
\ \
return ret; \ return ret; \
@ -91,20 +96,25 @@ ssize_t igloo_io_write(igloo_io_t *io, const void *buffer, size_t len, igloo_err
ssize_t ret = -1; ssize_t ret = -1;
igloo_error_t error_store; igloo_error_t error_store;
if (!io || !buffer) if (!error)
error = &error_store;
if (!io || !buffer) {
*error = igloo_ERROR_FAULT;
return -1; return -1;
}
if (!len) if (!len)
return 0; return 0;
if (!error)
error = &error_store;
igloo_thread_mutex_lock(&(io->lock)); igloo_thread_mutex_lock(&(io->lock));
io->touched = 1; io->touched = 1;
if (io->ifdesc->write) if (io->ifdesc->write) {
ret = io->ifdesc->write(igloo_INTERFACE_BASIC_CALL(io), buffer, len, error); ret = io->ifdesc->write(igloo_INTERFACE_BASIC_CALL(io), buffer, len, error);
} else {
*error = igloo_ERROR_GENERIC;
}
igloo_thread_mutex_unlock(&(io->lock)); igloo_thread_mutex_unlock(&(io->lock));
return ret; return ret;