Cppcheck: Clarify calculation precedence for '&' and '?'.

diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp
index caefdb8..9fb06de 100644 (file)
--- a/Src/7zCommon.cpp
+++ b/Src/7zCommon.cpp
@@ -409,7 +409,7 @@ UINT DirItemEnumerator::Open()
        }\r
        return\r
        static_cast<UINT>((\r
-               m_nFlags & LVNI_SELECTED\r
+               (m_nFlags & LVNI_SELECTED)\r
        ?       pView(m_pView)->GetSelectedCount()\r
        :       pView(m_pView)->GetItemCount()\r
        ) * nrgFolderPrefix);\r

diff --git a/Src/Common/BCMenu.cpp b/Src/Common/BCMenu.cpp
index f02e896..a1a7285 100644 (file)
--- a/Src/Common/BCMenu.cpp
+++ b/Src/Common/BCMenu.cpp
@@ -422,7 +422,7 @@ void BCMenu::DrawItem_Win9xNT2000 (LPDRAWITEMSTRUCT lpDIS)
                                MF_BYCOMMAND, &info);
                        if(state&ODS_CHECKED || info.hbmpUnchecked) {
                                Draw3DCheckmark(pDC, rect2, state&ODS_SELECTED,
-                                       state&ODS_CHECKED ? info.hbmpChecked :
+                                       (state&ODS_CHECKED) ? info.hbmpChecked :
                                info.hbmpUnchecked);
                        }
                }

diff --git a/Src/Common/lwdisp.c b/Src/Common/lwdisp.c
index 7e798da..b2052b2 100644 (file)
--- a/Src/Common/lwdisp.c
+++ b/Src/Common/lwdisp.c
@@ -685,7 +685,7 @@ static STDMETHODIMP Invoke(struct LWDispatch *This,
        VARIANT varEmpty;
        HRESULT sc = dispIdMember < 0 ? dispIdMember : (HRESULT)wFlags;
        if (pDispParams->cNamedArgs >
-               (wFlags & (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF) ? 1U : 0U))
+               ((wFlags & (DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF)) ? 1U : 0U))
                return DISP_E_NONAMEDARGS;
        VariantInit(&varEmpty);
        sc =

diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp
index 09bc2ee..ed0fa7f 100644 (file)
--- a/Src/DirScan.cpp
+++ b/Src/DirScan.cpp
@@ -275,14 +275,14 @@ int DirScan_GetItems(const PathContext &paths, const String subdir[],
                {
                        if (nDirs < 3)
                                AddToList(subdir[0], subdir[1], 
-                                       nDiffCode & DIFFCODE::FIRST  ? &dirs[0][i] : NULL, 
-                                       nDiffCode & DIFFCODE::SECOND ? &dirs[1][j] : NULL,
+                                       (nDiffCode & DIFFCODE::FIRST ) ? &dirs[0][i] : NULL, 
+                                       (nDiffCode & DIFFCODE::SECOND) ? &dirs[1][j] : NULL,
                                        nDiffCode, myStruct, parent);
                        else
                                AddToList(subdir[0], subdir[1], subdir[2], 
-                                       nDiffCode & DIFFCODE::FIRST  ? &dirs[0][i] : NULL,
-                                       nDiffCode & DIFFCODE::SECOND ? &dirs[1][j] : NULL,
-                                       nDiffCode & DIFFCODE::THIRD  ? &dirs[2][k] : NULL,
+                                       (nDiffCode & DIFFCODE::FIRST ) ? &dirs[0][i] : NULL,
+                                       (nDiffCode & DIFFCODE::SECOND) ? &dirs[1][j] : NULL,
+                                       (nDiffCode & DIFFCODE::THIRD ) ? &dirs[2][k] : NULL,
                                        nDiffCode, myStruct, parent);
                }
                else
@@ -291,8 +291,8 @@ int DirScan_GetItems(const PathContext &paths, const String subdir[],
                        if (nDirs < 3)
                        {
                                DIFFITEM *me = AddToList(subdir[0], subdir[1], 
-                                       nDiffCode & DIFFCODE::FIRST  ? &dirs[0][i] : NULL, 
-                                       nDiffCode & DIFFCODE::SECOND ? &dirs[1][j] : NULL,
+                                       (nDiffCode & DIFFCODE::FIRST ) ? &dirs[0][i] : NULL, 
+                                       (nDiffCode & DIFFCODE::SECOND) ? &dirs[1][j] : NULL,
                                        nDiffCode, myStruct, parent);
                                if ((nDiffCode & DIFFCODE::SKIPPED) == 0 && ((nDiffCode & DIFFCODE::SIDEFLAGS) == DIFFCODE::BOTH || bUniques))
                                {
@@ -307,9 +307,9 @@ int DirScan_GetItems(const PathContext &paths, const String subdir[],
                        else
                        {
                                DIFFITEM *me = AddToList(subdir[0], subdir[1], subdir[2], 
-                                       nDiffCode & DIFFCODE::FIRST  ? &dirs[0][i] : NULL,
-                                       nDiffCode & DIFFCODE::SECOND ? &dirs[1][j] : NULL,
-                                       nDiffCode & DIFFCODE::THIRD  ? &dirs[2][k] : NULL,
+                                       (nDiffCode & DIFFCODE::FIRST ) ? &dirs[0][i] : NULL,
+                                       (nDiffCode & DIFFCODE::SECOND) ? &dirs[1][j] : NULL,
+                                       (nDiffCode & DIFFCODE::THIRD ) ? &dirs[2][k] : NULL,
                                        nDiffCode, myStruct, parent);
                                if ((nDiffCode & DIFFCODE::SKIPPED) == 0 && ((nDiffCode & DIFFCODE::SIDEFLAGS) == DIFFCODE::ALL || bUniques))
                                {

diff --git a/Src/diffutils/src/io.c b/Src/diffutils/src/io.c
index 75d7f4f..c51c69f 100644 (file)
--- a/Src/diffutils/src/io.c
+++ b/Src/diffutils/src/io.c
@@ -180,7 +180,7 @@ slurp (current)
     {
       enum UNICODESET sig = get_unicode_signature(current);
       size_t alloc_extra
-        = (1 << sig) & ((1 << UCS2LE) | (1 << UCS2BE) | (1 << UCS4LE) | (1 << UCS4BE))
+        = ((1 << sig) & ((1 << UCS2LE) | (1 << UCS2BE) | (1 << UCS4LE) | (1 << UCS4BE)))
           // some flavor of non octet encoded unicode?
           ? ~0U        // yes, allocate extra room for transcoding
           : 0U;        // no, allocate no extra room for transcoding