[PATCH 4/6] regsvr32: Replace wsCommandLine with command_line

[Hugh McMaster]

wsCommandline is redundant now that we are working in Unicode. It makes no
sense to keep the WCHAR* when command_line can serve the same purpose.

---
 programs/regsvr32/regsvr32.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c
index 2190f9d..1c71736 100644
--- a/programs/regsvr32/regsvr32.c
+++ b/programs/regsvr32/regsvr32.c
@@ -210,7 +210,7 @@ int wmain(int argc, WCHAR* argv[])
     BOOL            CallInstall = FALSE;
     BOOL            Unregister = FALSE;
     BOOL            DllFound = FALSE;
-    WCHAR*          wsCommandLine = NULL;
+    WCHAR*          command_line = NULL;
     WCHAR           EmptyLine[1] = {0};
 
     OleInitialize(NULL);
@@ -234,7 +234,7 @@ int wmain(int argc, WCHAR* argv[])
                 break;
             case 'i':
             {
-                WCHAR* command_line = argv[i] + 2 /* strlen("/i") */;
+                command_line = argv[i] + 2 /* strlen("/i") */;
 
                 CallInstall = TRUE;
                 if (command_line[0] == ':' && command_line[1])
@@ -254,18 +254,14 @@ int wmain(int argc, WCHAR* argv[])
                             command_line[len] = 0;
                         }
                     }
-                    if (command_line[0])
+                    if (!command_line[0])
                     {
-                        wsCommandLine = command_line;
-                    }
-                    else
-                    {
-                        wsCommandLine = EmptyLine;
+                        command_line = EmptyLine;
                     }
                 }
                 else
                 {
-                    wsCommandLine = EmptyLine;
+                    command_line = EmptyLine;
                 }
                 break;
             }
@@ -301,7 +297,7 @@ int wmain(int argc, WCHAR* argv[])
 
             if (CallInstall)
             {
-                res = InstallDll(!Unregister, DllName, wsCommandLine);
+                res = InstallDll(!Unregister, DllName, command_line);
             }
 
             if (res)
-- 
1.9.1