Michael Stefaniuc : cmd: Avoid casting a const away.

Alexandre Julliard julliard at winehq.org
Mon Nov 30 16:13:47 CST 2020


Module: wine
Branch: master
Commit: 77fc01d39d732acf26658f13448739eeaf00de45
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=77fc01d39d732acf26658f13448739eeaf00de45

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Sun Nov 29 23:30:27 2020 +0100

cmd: Avoid casting a const away.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/cmd/builtins.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 934e55ac587..c6dce091c69 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1968,6 +1968,7 @@ static void WCMD_parse_line(CMD_LIST    *cmdStart,
   BOOL thisduplicate = FALSE;
   BOOL anyduplicates = FALSE;
   int  totalfound;
+  static WCHAR emptyW[] = L"";
 
   /* Skip lines if requested */
   if (*forf_skip) {
@@ -1998,7 +1999,7 @@ static void WCMD_parse_line(CMD_LIST    *cmdStart,
   for (varoffset=0;
        varidx >= 0 && varoffset<totalfound && (((varidx%26) + varoffset) < 26);
        varoffset++) {
-    forloopcontext.variable[varidx + varoffset] = (WCHAR *)nullW;
+    forloopcontext.variable[varidx + varoffset] = emptyW;
   }
 
   /* Loop extracting the tokens
@@ -2048,7 +2049,7 @@ static void WCMD_parse_line(CMD_LIST    *cmdStart,
     int i;
     for (i=varidx; i<MAX_FOR_VARIABLES; i++) {
       if ((forloopcontext.variable[i] != oldcontext.variable[i]) &&
-          (forloopcontext.variable[i] != nullW)) {
+          (forloopcontext.variable[i] != emptyW)) {
         heap_free(forloopcontext.variable[i]);
       }
     }




More information about the wine-cvs mailing list