From 02cd03845bdea24023685f775e54c120c261555e Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Tue, 11 Apr 2017 10:26:40 +0300 Subject: [PATCH] Fix variable shadowing warnings-as-errors when building with VS2015 --- C/zstdmt/lz4mt_decompress.c | 14 +++++++------- C/zstdmt/lz5mt_decompress.c | 14 +++++++------- C/zstdmt/zstdmt_decompress.c | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/C/zstdmt/lz4mt_decompress.c b/C/zstdmt/lz4mt_decompress.c index bd8997c5..e509f49f 100644 --- a/C/zstdmt/lz4mt_decompress.c +++ b/C/zstdmt/lz4mt_decompress.c @@ -532,18 +532,18 @@ size_t LZ4MT_decompressDCtx(LZ4MT_DCtx * ctx, LZ4MT_RdWr_t * rdwr) /* multi threaded */ for (t = 0; t < ctx->threads; t++) { - cwork_t *w = &ctx->cwork[t]; - w->in.buf = 0; - w->in.size = 0; - w->in.allocated = 0; - pthread_create(&w->pthread, NULL, pt_decompress, w); + cwork_t *wt = &ctx->cwork[t]; + wt->in.buf = 0; + wt->in.size = 0; + wt->in.allocated = 0; + pthread_create(&wt->pthread, NULL, pt_decompress, wt); } /* wait for all workers */ for (t = 0; t < ctx->threads; t++) { - cwork_t *w = &ctx->cwork[t]; + cwork_t *wt = &ctx->cwork[t]; void *p; - pthread_join(w->pthread, &p); + pthread_join(wt->pthread, &p); if (p) retval_of_thread = p; } diff --git a/C/zstdmt/lz5mt_decompress.c b/C/zstdmt/lz5mt_decompress.c index e02c076f..fc1f3d36 100644 --- a/C/zstdmt/lz5mt_decompress.c +++ b/C/zstdmt/lz5mt_decompress.c @@ -532,18 +532,18 @@ size_t LZ5MT_decompressDCtx(LZ5MT_DCtx * ctx, LZ5MT_RdWr_t * rdwr) /* multi threaded */ for (t = 0; t < ctx->threads; t++) { - cwork_t *w = &ctx->cwork[t]; - w->in.buf = 0; - w->in.size = 0; - w->in.allocated = 0; - pthread_create(&w->pthread, NULL, pt_decompress, w); + cwork_t *wt = &ctx->cwork[t]; + wt->in.buf = 0; + wt->in.size = 0; + wt->in.allocated = 0; + pthread_create(&wt->pthread, NULL, pt_decompress, wt); } /* wait for all workers */ for (t = 0; t < ctx->threads; t++) { - cwork_t *w = &ctx->cwork[t]; + cwork_t *wt = &ctx->cwork[t]; void *p; - pthread_join(w->pthread, &p); + pthread_join(wt->pthread, &p); if (p) retval_of_thread = p; } diff --git a/C/zstdmt/zstdmt_decompress.c b/C/zstdmt/zstdmt_decompress.c index 1c7af2ec..5882b01c 100644 --- a/C/zstdmt/zstdmt_decompress.c +++ b/C/zstdmt/zstdmt_decompress.c @@ -627,10 +627,10 @@ static size_t st_decompress(void *arg) goto error_clib; if (zOut.pos) { - ZSTDMT_Buffer w; - w.size = zOut.pos; - w.buf = zOut.dst; - rv = ctx->fn_write(ctx->arg_write, &w); + ZSTDMT_Buffer wb; + wb.size = zOut.pos; + wb.buf = zOut.dst; + rv = ctx->fn_write(ctx->arg_write, &wb); if (rv != 0) { result = mt_error(rv); goto error; @@ -810,15 +810,15 @@ size_t ZSTDMT_decompressDCtx(ZSTDMT_DCtx * ctx, ZSTDMT_RdWr_t * rdwr) /* multi threaded */ for (t = 0; t < ctx->threads; t++) { - cwork_t *w = &ctx->cwork[t]; - pthread_create(&w->pthread, NULL, pt_decompress, w); + cwork_t *wt = &ctx->cwork[t]; + pthread_create(&wt->pthread, NULL, pt_decompress, wt); } /* wait for all workers */ for (t = 0; t < ctx->threads; t++) { - cwork_t *w = &ctx->cwork[t]; + cwork_t *wt = &ctx->cwork[t]; void *p; - pthread_join(w->pthread, &p); + pthread_join(wt->pthread, &p); if (p) retval_of_thread = p; }