some minor fixes

- version number was 1.1.0 instead of 1.1.2
- renamed mem.h to fix compiling the windows binaries
- changes (rv < 0) to (rv != 0)
This commit is contained in:
Tino Reichardt
2016-12-26 11:04:47 +01:00
parent e123752e09
commit b351c1a3fb
10 changed files with 46 additions and 60 deletions

View File

@@ -17,7 +17,7 @@
#define LZ4F_DISABLE_OBSOLETE_ENUMS
#include "lz4frame.h"
#include "mem.h"
#include "memmt.h"
#include "threading.h"
#include "list.h"
#include "lz4mt.h"
@@ -174,7 +174,7 @@ static size_t pt_write(LZ4MT_DCtx * ctx, struct writelist *wl)
wl = list_entry(entry, struct writelist, node);
if (wl->frame == ctx->curframe) {
int rv = ctx->fn_write(ctx->arg_write, &wl->out);
if (rv < 0)
if (rv != 0)
return mt_error(rv);
ctx->outsize += wl->out.size;
ctx->curframe++;
@@ -203,7 +203,7 @@ static size_t pt_read(LZ4MT_DCtx * ctx, LZ4MT_Buffer * in, size_t * frame)
hdr.buf = hdrbuf + 4;
hdr.size = 8;
rv = ctx->fn_read(ctx->arg_read, &hdr);
if (rv < 0) {
if (rv != 0) {
pthread_mutex_unlock(&ctx->read_mutex);
return mt_error(rv);
}
@@ -214,7 +214,7 @@ static size_t pt_read(LZ4MT_DCtx * ctx, LZ4MT_Buffer * in, size_t * frame)
hdr.buf = hdrbuf;
hdr.size = 12;
rv = ctx->fn_read(ctx->arg_read, &hdr);
if (rv < 0) {
if (rv != 0) {
pthread_mutex_unlock(&ctx->read_mutex);
return mt_error(rv);
}
@@ -253,7 +253,7 @@ static size_t pt_read(LZ4MT_DCtx * ctx, LZ4MT_Buffer * in, size_t * frame)
in->size = toRead;
rv = ctx->fn_read(ctx->arg_read, in);
/* generic read failure! */
if (rv < 0) {
if (rv != 0) {
pthread_mutex_unlock(&ctx->read_mutex);
return mt_error(rv);
}
@@ -430,7 +430,7 @@ static size_t st_decompress(void *arg)
/* read new input */
in->size = nextToLoad;
rv = ctx->fn_read(ctx->arg_read, in);
if (rv < 0) {
if (rv != 0) {
free(in->buf);
free(out->buf);
return mt_error(rv);
@@ -459,7 +459,7 @@ static size_t st_decompress(void *arg)
/* have some output */
if (out->size) {
rv = ctx->fn_write(ctx->arg_write, out);
if (rv < 0) {
if (rv != 0) {
free(in->buf);
free(out->buf);
return mt_error(rv);
@@ -499,7 +499,7 @@ size_t LZ4MT_decompressDCtx(LZ4MT_DCtx * ctx, LZ4MT_RdWr_t * rdwr)
in->buf = buf;
in->size = 4;
rv = ctx->fn_read(ctx->arg_read, in);
if (rv < 0)
if (rv != 0)
return mt_error(rv);
if (in->size != 4)
return ERROR(data_error);