Dmitry Timoshkov : msi: Simplify the code.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jun 15 07:23:06 CDT 2007


Module: wine
Branch: master
Commit: 6076485fde9baf2e3bc109267e91761b14de9a90
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6076485fde9baf2e3bc109267e91761b14de9a90

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Fri Jun 15 17:43:40 2007 +0900

msi: Simplify the code.

---

 dlls/msi/action.c |   24 +++++++-----------------
 1 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 00ed572..d09ddd0 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -4587,30 +4587,20 @@ static LONG env_set_flags( LPCWSTR *name, LPWSTR *value, DWORD *flags )
     static const WCHAR prefix[] = {'[','~',']',0};
 
     *flags = 0;
-    while (*cptr && (*cptr == '=' || *cptr == '+' ||
-           *cptr == '-' || *cptr == '!' || *cptr == '*'))
+    while (*cptr)
     {
-        switch (*cptr)
-        {
-        case '=':
+        if (*cptr == '=')
             *flags |= ENV_ACT_SETALWAYS;
-            break;
-        case '+':
+        else if (*cptr == '+')
             *flags |= ENV_ACT_SETABSENT;
-            break;
-        case '-':
+        else if (*cptr == '-')
             *flags |= ENV_ACT_REMOVE;
-            break;
-        case '!':
+        else if (*cptr == '!')
             *flags |= ENV_ACT_REMOVEMATCH;
-            break;
-        case '*':
+        else if (*cptr == '*')
             *flags |= ENV_MOD_MACHINE;
+        else
             break;
-        default:
-            ERR("Unknown Environment flag: %c\n", *cptr);
-            return ERROR_FUNCTION_FAILED;
-        }
 
         cptr++;
         (*name)++;




More information about the wine-cvs mailing list