diff options
Diffstat (limited to 'src/cache.c')
| -rw-r--r-- | src/cache.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cache.c b/src/cache.c index c88cc78..ebe1047 100644 --- a/src/cache.c +++ b/src/cache.c @@ -11,7 +11,7 @@ int cache_create(struct stream * const restrict in, const struct settings * cons int ret; void *cache; - try(!(cache = calloc(in->n, s->stride)), err, ENOMEM); + try(!(cache = calloc(in->n, s->stride)), err, ENOMEM, "out of memory"); in->cache = cache; err: @@ -23,8 +23,8 @@ int cache_populate(struct stream * const restrict in) int ret = 0; ssize_t i; - for (i = 0; i < in->n; ++i) { - try_s((ret = in->get_element(in, i, in->cache + i)), err); + for (i = 0; i < in->n && !ret; ++i) { + ret = in->get_element(in, i, in->cache + i); } err: @@ -36,8 +36,8 @@ int cache_flush(struct stream * const in) int ret; ssize_t i; - for (i = 0; i < in->n; ++i) { - try_s((ret = in->put_element(in, i, in->cache + i)), err); + for (i = 0; i < in->n && !ret; ++i) { + ret = in->put_element(in, i, in->cache + i); } err: @@ -48,7 +48,7 @@ int cache_destroy(struct stream * const in) { int ret; - try(!in->cache, err, EINVAL); + try(!in->cache, err, EINVAL, "trying to destroy cache of uncached streadm"); free(in->cache); in->cache = NULL; err: |