From 24a2f05138ce369d826a3b1f95752b2c0f66423c Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 11 Dec 2021 14:57:20 -0700 Subject: [PATCH] Fix some shift-op-parentheses warnings --- cde/lib/DtSvc/DtCodelibs/strhash.C | 12 ++++++------ cde/programs/dtwm/WmInitWs.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cde/lib/DtSvc/DtCodelibs/strhash.C b/cde/lib/DtSvc/DtCodelibs/strhash.C index b04f8fc5f..dd06655de 100644 --- a/cde/lib/DtSvc/DtCodelibs/strhash.C +++ b/cde/lib/DtSvc/DtCodelibs/strhash.C @@ -65,10 +65,10 @@ unsigned strhash(const char *p) while (*p != '\0') { h = (h << 4) + (unsigned)CHARADV(p); - if (g = h & ((unsigned)0xF << BITS(unsigned) - 4)) + if ((g = h) & ((unsigned)0xF << (BITS(unsigned) - 4))) { - h ^= g >> BITS(unsigned) - 4; - h ^= g; + h ^= g >> (BITS(unsigned) - 4); + h ^= g; } } return h; @@ -93,10 +93,10 @@ unsigned strhashi(const char *p) h = (h << 4) + (unsigned)tolower(*p++); } - if (g = h & ((unsigned)0xF << BITS(unsigned) - 4)) + if ((g = h) & ((unsigned)0xF << (BITS(unsigned) - 4))) { - h ^= g >> BITS(unsigned) - 4; - h ^= g; + h ^= g >> (BITS(unsigned) - 4); + h ^= g; } } return h; diff --git a/cde/programs/dtwm/WmInitWs.c b/cde/programs/dtwm/WmInitWs.c index c70b2c195..740fb5cc0 100644 --- a/cde/programs/dtwm/WmInitWs.c +++ b/cde/programs/dtwm/WmInitWs.c @@ -234,7 +234,7 @@ BuildLockMaskSequence(void) * funny because we skip the case of all the * bits cleared. */ - run = (0x1 << bit-1); /* number of consecutive masks to set + run = (0x1 << (bit-1)); /* number of consecutive masks to set bits in */ bit_on = False; /* are we setting bits or not? */