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

Fix variable shadowing warnings-as-errors when building with VS2015

Browse Source
This commit is contained in:
Aras Pranckevicius
2017-04-11 10:26:40 +03:00
parent 1f7f294b12
commit 02cd03845b
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
C/zstdmt/lz4mt_decompress.c
View File

@@ -532,18 +532,18 @@ size_t LZ4MT_decompressDCtx(LZ4MT_DCtx * ctx, LZ4MT_RdWr_t * rdwr)
/* multi threaded */ /* multi threaded */
for (t = 0; t < ctx->threads; t++) { for (t = 0; t < ctx->threads; t++) {
cwork_t *w = &ctx->cwork[t]; cwork_t *wt = &ctx->cwork[t];
w->in.buf = 0; wt->in.buf = 0;
w->in.size = 0; wt->in.size = 0;
w->in.allocated = 0; wt->in.allocated = 0;
pthread_create(&w->pthread, NULL, pt_decompress, w); pthread_create(&wt->pthread, NULL, pt_decompress, wt);
} }
/* wait for all workers */ /* wait for all workers */
for (t = 0; t < ctx->threads; t++) { for (t = 0; t < ctx->threads; t++) {
cwork_t *w = &ctx->cwork[t]; cwork_t *wt = &ctx->cwork[t];
void *p; void *p;
pthread_join(w->pthread, &p); pthread_join(wt->pthread, &p);
if (p) if (p)
retval_of_thread = p; retval_of_thread = p;
} }

14
C/zstdmt/lz5mt_decompress.c
View File

@@ -532,18 +532,18 @@ size_t LZ5MT_decompressDCtx(LZ5MT_DCtx * ctx, LZ5MT_RdWr_t * rdwr)
/* multi threaded */ /* multi threaded */
for (t = 0; t < ctx->threads; t++) { for (t = 0; t < ctx->threads; t++) {
cwork_t *w = &ctx->cwork[t]; cwork_t *wt = &ctx->cwork[t];
w->in.buf = 0; wt->in.buf = 0;
w->in.size = 0; wt->in.size = 0;
w->in.allocated = 0; wt->in.allocated = 0;
pthread_create(&w->pthread, NULL, pt_decompress, w); pthread_create(&wt->pthread, NULL, pt_decompress, wt);
} }
/* wait for all workers */ /* wait for all workers */
for (t = 0; t < ctx->threads; t++) { for (t = 0; t < ctx->threads; t++) {
cwork_t *w = &ctx->cwork[t]; cwork_t *wt = &ctx->cwork[t];
void *p; void *p;
pthread_join(w->pthread, &p); pthread_join(wt->pthread, &p);
if (p) if (p)
retval_of_thread = p; retval_of_thread = p;
} }

16
C/zstdmt/zstdmt_decompress.c
View File

@@ -627,10 +627,10 @@ static size_t st_decompress(void *arg)
goto error_clib; goto error_clib;
if (zOut.pos) { if (zOut.pos) {
ZSTDMT_Buffer w; ZSTDMT_Buffer wb;
w.size = zOut.pos; wb.size = zOut.pos;
w.buf = zOut.dst; wb.buf = zOut.dst;
rv = ctx->fn_write(ctx->arg_write, &w); rv = ctx->fn_write(ctx->arg_write, &wb);
if (rv != 0) { if (rv != 0) {
result = mt_error(rv); result = mt_error(rv);
goto error; goto error;
@@ -810,15 +810,15 @@ size_t ZSTDMT_decompressDCtx(ZSTDMT_DCtx * ctx, ZSTDMT_RdWr_t * rdwr)
/* multi threaded */ /* multi threaded */
for (t = 0; t < ctx->threads; t++) { for (t = 0; t < ctx->threads; t++) {
cwork_t *w = &ctx->cwork[t]; cwork_t *wt = &ctx->cwork[t];
pthread_create(&w->pthread, NULL, pt_decompress, w); pthread_create(&wt->pthread, NULL, pt_decompress, wt);
} }
/* wait for all workers */ /* wait for all workers */
for (t = 0; t < ctx->threads; t++) { for (t = 0; t < ctx->threads; t++) {
cwork_t *w = &ctx->cwork[t]; cwork_t *wt = &ctx->cwork[t];
void *p; void *p;
pthread_join(w->pthread, &p); pthread_join(wt->pthread, &p);
if (p) if (p)
retval_of_thread = p; retval_of_thread = p;
} }