Changeset 1782

Timestamp:

Jun 28, 2014, 11:34:01 PM (11 years ago)

Author:

Gregg Young

Message:

Addition code issues found based on cppcheck warnings

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• filter.c (modified) (2 diffs)
• mainwnd2.c (modified) (2 diffs)
• pathutil.c (modified) (2 diffs)
• shadow.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -1659 +1659 @@
 
       WaitChild = xmallocz(sizeof(WAITCHILD), pszSrcFile, __LINE__);
-      WaitChild->pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
       if (!WaitChild)
         return 0;
+      WaitChild->pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
       if (s) {
         if (!dcd->info->extract) {

trunk/dll/filter.c

@@ -21 +21 @@
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   31 May 11 SHL Rework Filter() for speed
+  28 Jun 14 GKY Fix errors identified with CPPCheck;
 
 ***********************************************************************/
@@ -458 +459 @@
           WinSendDlgItemMsg(hwnd, MSK_TEXT,
                             EM_SETSEL, MPFROM2SHORT(0, 256), MPVOID);
-        }
-      }
-      *mask->szText = 0;
+        }
+        *mask->szText = 0;
+      }
     }
     WinShowWindow(hwnd, TRUE);

trunk/dll/mainwnd2.c

@@ -42 +42 @@
                 never being posted
   12 Aug 12 GKY Allow for selection of include subdirectories or a list file on initial startup of compare dirs
+  28 Jun 14 GKY Fix errors identified with CPPCheck;
 
 ***********************************************************************/
@@ -973 +974 @@
         }
       }
-    }
-    // 2014-06-11 SHL Initialize view, sort and filter button text
-    if (pd->hwndDir1) {
-      hwndC = WinWindowFromID(pd->hwndDir1, FID_CLIENT);
-      if (hwndC) {
-        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
-        if (dcd && dcd->hwndCnr)
-          PostMsg(dcd->hwndCnr, UM_SETUP2, MPVOID, MPVOID);
-      }
-    }
-    if (pd->hwndDir2) {
-      hwndC = WinWindowFromID(pd->hwndDir2, FID_CLIENT);
-      if (hwndC) {
-        dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
-        if (dcd && dcd->hwndCnr)
-          PostMsg(dcd->hwndCnr, UM_SETUP2, MPVOID, MPVOID);
-      }
-    }
-
-    which = 0;
-    size = sizeof(ULONG);
-    if (PrfQueryProfileData(fmprof,
-                            realappname,
-                            "FM/4 Max",
-                            (PVOID)&which,
-                            &size) &&
-        size == sizeof(ULONG) &&
-        which)
-    {
-      PostMsg(hwnd,
-              UM_MAXIMIZE,
-              MPFROMLONG(((which == 1) ?
-                          pd->hwndDir1 : pd->hwndDir2)), MPVOID);
-    }
-    PostMsg(hwnd, UM_SIZE, MPVOID, MPVOID);
-    if (!hwndTree)
-      PostMsg(hwnd, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
-    load_tools(NULL);
-    PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
-    fRunning = TRUE;
+    //}
+      // 2014-06-11 SHL Initialize view, sort and filter button text
+      if (pd->hwndDir1) {
+        hwndC = WinWindowFromID(pd->hwndDir1, FID_CLIENT);
+        if (hwndC) {
+          dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
+          if (dcd && dcd->hwndCnr)
+            PostMsg(dcd->hwndCnr, UM_SETUP2, MPVOID, MPVOID);
+        }
+      }
+      if (pd->hwndDir2) {
+        hwndC = WinWindowFromID(pd->hwndDir2, FID_CLIENT);
+        if (hwndC) {
+          dcd = WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
+          if (dcd && dcd->hwndCnr)
+            PostMsg(dcd->hwndCnr, UM_SETUP2, MPVOID, MPVOID);
+        }
+      }
+  
+      which = 0;
+      size = sizeof(ULONG);
+      if (PrfQueryProfileData(fmprof,
+                              realappname,
+                              "FM/4 Max",
+                              (PVOID)&which,
+                              &size) &&
+          size == sizeof(ULONG) &&
+          which)
+      {
+        PostMsg(hwnd,
+                UM_MAXIMIZE,
+                MPFROMLONG(((which == 1) ?
+                            pd->hwndDir1 : pd->hwndDir2)), MPVOID);
+      }
+      PostMsg(hwnd, UM_SIZE, MPVOID, MPVOID);
+      if (!hwndTree)
+        PostMsg(hwnd, UM_BUILDDRIVEBAR, MPVOID, MPVOID);
+      load_tools(NULL);
+      PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
+      fRunning = TRUE;
+    } //if pd
     return 0;
 

trunk/dll/pathutil.c

@@ -22 +22 @@
                 So calls to these functions had to be changed.
   21 Mar 14 SHL Add IsAbsolutePath
+  28 Jun 14 GKY Fix errors identified with CPPCheck;
 
 ***********************************************************************/
@@ -263 +264 @@
     }
     // if it doesn't have an extension try it with all the standard ones and add if found
-    else if (szCmdLine && (!strchr(szCmdLine, '.') ||
-                           strrchr(szCmdLine, '.' ) < strrchr(szCmdLine, '\\'))) {
+    else if (!strchr(szCmdLine, '.') ||
+             strrchr(szCmdLine, '.' ) < strrchr(szCmdLine, '\\')) {
       if (!strchr(szCmdLine, ' ')) {
         // strip quotes readded by BuildQuotedFileName

trunk/dll/shadow.c

@@ -16 +16 @@
   12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  28 Jun 14 GKY Fix errors identified with CPPCheck;
 
 ***********************************************************************/
@@ -112 +113 @@
   if (obj) {
     sprintf(s2,
-            "%s%s%sOBJECTID=<FM2_%s>",
+            "%s%s%s%sOBJECTID=<FM2_%s>",
             objtitle,
             (p == type[1]) ? "ICONFILE=" : NullStr,