From 58bef320a4ebb29debe87dc387d9f3dd2f712727 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 27 Apr 2020 16:48:40 +0000 Subject: [PATCH] uppsrc: CLANG warnings fixes git-svn-id: svn://ultimatepp.org/upp/trunk@14392 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/GLDraw/Code.cpp | 3 ++- uppsrc/plugin/zstd_legacy/lib/bitstream.h | 2 +- uppsrc/plugin/zstd_legacy/lib/zstd_compress.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/uppsrc/GLDraw/Code.cpp b/uppsrc/GLDraw/Code.cpp index 32540e2f2..e5f2b5bfa 100644 --- a/uppsrc/GLDraw/Code.cpp +++ b/uppsrc/GLDraw/Code.cpp @@ -44,7 +44,7 @@ GLCode::GLCode(const char *vertex_shader, const char *pixel_shader) if(p.Id("sampler2D") || p.Id("sampler3D")) { int n; String id = readID(n); - if(id.GetCount()) + if(id.GetCount()) { if(n) { for(int i = 0; i < n; i++) { ASSERT(GetUniform(id + '[' + AsString(i) + ']') >= 0); @@ -53,6 +53,7 @@ GLCode::GLCode(const char *vertex_shader, const char *pixel_shader) } else glUniform1i(GetUniform(id), ti++); + } } else p.SkipTerm(); diff --git a/uppsrc/plugin/zstd_legacy/lib/bitstream.h b/uppsrc/plugin/zstd_legacy/lib/bitstream.h index 89812b4b6..d63a55e12 100644 --- a/uppsrc/plugin/zstd_legacy/lib/bitstream.h +++ b/uppsrc/plugin/zstd_legacy/lib/bitstream.h @@ -146,7 +146,7 @@ MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits); /*-************************************************************** * Internal functions ****************************************************************/ -MEM_STATIC unsigned BIT_highbit32 (register U32 val) +MEM_STATIC unsigned BIT_highbit32 (U32 val) { # if defined(_MSC_VER) /* Visual */ unsigned long r=0; diff --git a/uppsrc/plugin/zstd_legacy/lib/zstd_compress.c b/uppsrc/plugin/zstd_legacy/lib/zstd_compress.c index 9baf7c705..acc0fa2c8 100644 --- a/uppsrc/plugin/zstd_legacy/lib/zstd_compress.c +++ b/uppsrc/plugin/zstd_legacy/lib/zstd_compress.c @@ -967,7 +967,7 @@ MEM_STATIC void ZSTD_storeSeq(seqStore_t* seqStorePtr, size_t litLength, const v /*-************************************* * Match length counter ***************************************/ -static unsigned ZSTD_NbCommonBytes (register size_t val) +static unsigned ZSTD_NbCommonBytes (size_t val) { if (MEM_isLittleEndian()) { if (MEM_64bits()) {