Changeset 1498 for trunk/dll/grep.c

Timestamp:

Jan 18, 2010, 1:57:01 AM (16 years ago)

Author:

Gregg Young

Message:

Changes to get FM2 to compile with the latest watcom 1.9 beta (mostly type casts of CHAR CONSTANT * to CHAR *). Changes to get the environment settings working everywhere again (broken by the change that moved commands to the INI); Added an environment size variable (set to 2048 which was the largest I found hard coded). Still need to find everywhere the environment size is set and use this variable.

File:

• trunk/dll/grep.c (modified) (7 diffs)

trunk/dll/grep.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2009 Steven H. Levine
+  Copyright (c) 2001, 2010 Steven H. Levine
 
   12 Feb 03 SHL InsertGrepFile: standardize EA math
@@ -33 +33 @@
   08 Mar 09 GKY Additional strings move to String Table
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
+  17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
 
 ***********************************************************************/
@@ -312 +313 @@
       // hwndStatus does not exist for applet
       WinSetWindowText(hwndStatus ? hwndStatus : grep.hwndCurFile,
-                       GetPString(grep.finddupes ? IDS_GREPDUPETEXT :
+                       (CHAR *) GetPString(grep.finddupes ? IDS_GREPDUPETEXT :
                                                    IDS_GREPSCANTEXT));
 
@@ -722 +723 @@
     if (grep->sayfiles) {
       if (!hwndStatus)
-        WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPINSERTINGTEXT));
+        WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
       else {
         if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
-          WinSetWindowText(hwndStatus, GetPString(IDS_GREPINSERTINGTEXT));
+          WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPINSERTINGTEXT));
       }
     }
@@ -1329 +1330 @@
   if (x) {
     if (!hwndStatus)
-      WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPESORTINGTEXT));
+      WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPDUPESORTINGTEXT));
     else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
-      WinSetWindowText(hwndStatus, GetPString(IDS_GREPDUPESORTINGTEXT));
+      WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPDUPESORTINGTEXT));
     // DosSleep(0);  //26 Aug 07 GKY 1  // 07 Feb 08 SHL
     grep->dupenames = xmalloc(sizeof(DUPES *) * (x + 1), pszSrcFile, __LINE__);
@@ -1365 +1366 @@
 
       if (!hwndStatus)
-        WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+        WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPDUPECOMPARINGTEXT));
       else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
-        WinSetWindowText(hwndStatus, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+        WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPDUPECOMPARINGTEXT));
 
       InitITimer(pitdSleep, 0);         // Reset rate estimator
@@ -1523 +1524 @@
         DosBeep(50, 100);
       if (!hwndStatus)
-        WinSetWindowText(grep->hwndCurFile, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+        WinSetWindowText(grep->hwndCurFile, (CHAR *) GetPString(IDS_GREPDUPECOMPARINGTEXT));
       else if (WinQueryFocus(HWND_DESKTOP) == grep->hwndFiles)
-        WinSetWindowText(hwndStatus, GetPString(IDS_GREPDUPECOMPARINGTEXT));
+        WinSetWindowText(hwndStatus, (CHAR *) GetPString(IDS_GREPDUPECOMPARINGTEXT));
       x = y = 0;
       xfree(grep->dupenames, pszSrcFile, __LINE__);