From: David Quintana <gigaherz@gmail.com>
Date: Fri, 2 May 2014 17:27:28 +0000 (+0000)
Subject: [SHELL32]
X-Git-Tag: backups/shell-experiments@75904~264
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=8c3a5f9b93789cfcbeabb8774e15ba587ddddf7f

[SHELL32]
* Fix redundant clauses by converting the code to a switch block. Adapted from a patch by Victor Martinez.
CORE-8161 #resolve #comment Fixed in the shell-experiments branch. Thanks.

svn path=/branches/shell-experiments/; revision=63115
---

diff --git a/dll/win32/shell32/shellitem.cpp b/dll/win32/shell32/shellitem.cpp
index ce767e016e8..49ae0ca19bc 100644
--- a/dll/win32/shell32/shellitem.cpp
+++ b/dll/win32/shell32/shellitem.cpp
@@ -122,20 +122,24 @@ HRESULT WINAPI CShellItem::GetDisplayName(SIGDN sigdnName, LPWSTR *ppszName)
     hr = get_parent_shellfolder(&parent_folder);
     if (SUCCEEDED(hr))
     {
-        if (sigdnName == SIGDN_PARENTRELATIVEEDITING)
-            uFlags = SHGDN_FOREDITING | SHGDN_INFOLDER;
-        else if (sigdnName == SIGDN_DESKTOPABSOLUTEEDITING)
-            uFlags = SHGDN_FOREDITING;
-        else if (sigdnName == SIGDN_PARENTRELATIVEEDITING)
+        switch (sigdnName)
+        {
+        case SIGDN_PARENTRELATIVEEDITING:
             uFlags = SHGDN_FOREDITING | SHGDN_INFOLDER;
-        else if (sigdnName == SIGDN_DESKTOPABSOLUTEEDITING)
+            break;
+        case SIGDN_DESKTOPABSOLUTEEDITING:
             uFlags = SHGDN_FOREDITING;
-        else if (sigdnName == SIGDN_PARENTRELATIVEPARSING)
+            break;
+        case SIGDN_PARENTRELATIVEPARSING:
             uFlags = SHGDN_FORPARSING | SHGDN_INFOLDER;
-        else if (sigdnName == SIGDN_DESKTOPABSOLUTEPARSING)
+            break;
+        case SIGDN_DESKTOPABSOLUTEPARSING:
             uFlags = SHGDN_FORPARSING;
-        else
+            break;
+        default:
             uFlags = SHGDN_NORMAL;
+            break;
+        }
 
         hr = parent_folder->GetDisplayNameOf(m_pidl, uFlags, &name);
         if (SUCCEEDED(hr))