xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-11 06:07:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed multiple returning when doing mt compressing/decompressing

Browse Source
This commit is contained in:
Tino Reichardt
2016-12-30 17:48:12 +01:00
parent 62ccbe9d58
commit f4f2729f08
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
C/zstdmt/zstdmt_compress.c
View File

@@ -328,7 +328,7 @@ static void *pt_compress(void *arg)
size_t ZSTDMT_compressCCtx(ZSTDMT_CCtx * ctx, ZSTDMT_RdWr_t * rdwr)
{
int t;
void *rv = 0;
void *retval_of_thread = 0;
if (!ctx)
return ZSTDMT_ERROR(init_missing);
@@ -358,7 +358,7 @@ size_t ZSTDMT_compressCCtx(ZSTDMT_CCtx * ctx, ZSTDMT_RdWr_t * rdwr)
void *p;
pthread_join(w->pthread, &p);
if (p)
rv = p;
retval_of_thread = p;
}
/* clean up the free list */
@@ -373,7 +373,7 @@ size_t ZSTDMT_compressCCtx(ZSTDMT_CCtx * ctx, ZSTDMT_RdWr_t * rdwr)
}
/* on error, these two lists may have some entries */
if (rv) {
if (retval_of_thread) {
struct writelist *wl;
struct list_head *entry;
@@ -394,7 +394,7 @@ size_t ZSTDMT_compressCCtx(ZSTDMT_CCtx * ctx, ZSTDMT_RdWr_t * rdwr)
}
}
return (size_t) rv;
return (size_t)retval_of_thread;
}
/* returns current uncompressed data size */