[3/3] cmd: verify_mode has BOOL type instead of int

Frédéric Delanoy frederic.delanoy at gmail.com
Fri Sep 16 01:44:07 CDT 2011


---
 programs/cmd/builtins.c |    8 +++++---
 programs/cmd/wcmdmain.c |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 9c16e8f..99a2314 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -50,12 +50,14 @@ struct env_stack *pushd_directories;
 
 extern HINSTANCE hinst;
 extern WCHAR inbuilt[][10];
-extern int verify_mode, defaultColor;
+extern int defaultColor;
 extern BOOL echo_mode;
 extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
 extern BATCH_CONTEXT *context;
 extern DWORD errorlevel;
 
+static BOOL verify_mode = FALSE;
+
 static const WCHAR dotW[]    = {'.','\0'};
 static const WCHAR dotdotW[] = {'.','.','\0'};
 static const WCHAR slashW[]  = {'\\','\0'};
@@ -2617,11 +2619,11 @@ void WCMD_verify (const WCHAR *command) {
     return;
   }
   if (lstrcmpiW(command, onW) == 0) {
-    verify_mode = 1;
+    verify_mode = TRUE;
     return;
   }
   else if (lstrcmpiW(command, offW) == 0) {
-    verify_mode = 0;
+    verify_mode = FALSE;
     return;
   }
   else WCMD_output (WCMD_LoadMessage(WCMD_VERIFYERR));
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index beca20e..92b76fc 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -86,7 +86,7 @@ const WCHAR externals[NUM_EXTERNALS][10] = {
 
 HINSTANCE hinst;
 DWORD errorlevel;
-int verify_mode = 0, defaultColor = 7;
+int defaultColor = 7;
 BOOL echo_mode = TRUE;
 static int opt_c, opt_k, opt_s;
 const WCHAR newline[] = {'\r','\n','\0'};
-- 
1.7.6.3




More information about the wine-patches mailing list