Changeset 1347 for trunk/dll

Timestamp:

Dec 20, 2008, 5:22:16 AM (17 years ago)

Author:

Gregg Young

Message:

More code cleanup

Location:

trunk/dll

Files:

• dirsize.c (modified) (4 diffs)
• draglist.c (modified) (1 diff)
• droplist.c (modified) (2 diffs)
• eas.c (modified) (3 diffs)
• filldir.c (modified) (10 diffs)
• filter.c (modified) (1 diff)
• findrec.c (modified) (1 diff)
• fm2cmd.c (modified) (1 diff)
• fsopen.c (modified) (1 diff)
• getnames.c (modified) (1 diff)
• info.c (modified) (1 diff)

trunk/dll/dirsize.c

@@ -142 +142 @@
 
   CheckDrive(toupper(*pszFileName), FileSystem, NULL);
-  /*if (!stricmp(FileSystem, NTFS)) {
-    saymsg(MB_OK,
-           HWND_DESKTOP,
-           NullStr,
-           GetPString(IDS_NTFSDRIVERFAILSTEXT));
-    return FALSE;
-  } */
   ulBufBytes = sizeof(FILEFINDBUF4L) * FilesToGet;
   pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
@@ -162 +155 @@
   hdir = HDIR_CREATE;
   ulFindCnt = 1;
-  // memset(pffbArray, 0, sizeof(FILEFINDBUF4L));       // 11 Aug 07 SHL bypass memset
   DosError(FERR_DISABLEHARDERR);
   // Check directory exists
@@ -717 +709 @@
               // Place text above graph box with a bit of whitespace between
               ptl.x = oi->rclItem.xLeft;
-              ptl.y = yBottom + boxHeight + 6;  // 03 Aug 07 SHL
-              // GpiMove(oi->hps, &ptl);
+              ptl.y = yBottom + boxHeight + 6;
               GpiCharStringAt(oi->hps, &ptl, p - pci->pszDisplayName,
                               pci->pszDisplayName);
@@ -725 +716 @@
 
               // draw the graph box
-              // GpiQueryTextBox(oi->hps, 1, "#", TXTBOX_COUNT, aptl);  // 03 Aug 07 SHL
               // draw black outline
               GpiSetColor(oi->hps, CLR_BLACK);

trunk/dll/draglist.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2007 Steven H.Levine
+  Copyright (c) 2001, 2008 Steven H.Levine
 
   16 Oct 02 SHL DoFileDrag: don't free stack

trunk/dll/droplist.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2007 Steven H.Levine
+  Copyright (c) 2003, 2008 Steven H.Levine
 
   22 Nov 02 SHL Baseline
@@ -246 +246 @@
         ret = TRUE;
 
-      // FreeDragInfoData(hwnd, pDInfo);        // 20 Apr 07 SHL
       DrgFreeDraginfo(pDInfo);
     }

trunk/dll/eas.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2006 Steven H. Levine
+  Copyright (c) 2004, 2008 Steven H. Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -1306 +1306 @@
   }
   else {
-    //Runtime_Error(pszSrcFile, __LINE__, "why here", filename);
-    //03 AUG 07 GKY This isn't an error it is for processing Readonly files
     /* try it without opening it */
     if (!DosQueryPathInfo(filename, FIL_QUERYEASIZE, (PVOID) & fsa4,
@@ -1347 +1345 @@
                 info = xmalloc(sizeof(HOLDFEA), pszSrcFile, __LINE__);
                 if (info) {
-        // 29 Nov 07 GKY One short (EA search crash)
+               // 29 Nov 07 GKY One short (EA search crash)
                   info->pfea =
                     xmalloc(eaop.fpFEA2List->cbList - sizeof(ULONG) + 1,

trunk/dll/filldir.c

@@ -213 +213 @@
                        CM_INVALIDATERECORD,
                        MPFROMP(&StubbyScan->pci),
-                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
-        }
+                       MPFROM2SHORT(1, CMA_ERASE | CMA_REPOSITION));
+          }
         if (WinIsWindow((HAB)0, StubbyScan->hwndDrivesList)) {
           WinSendMsg(StubbyScan->hwndDrivesList,
@@ -992 +992 @@
                 ullTotalBytes += ullBytes;
               } // for
-              // 13 Aug 07 SHL ulSelCnt checked already?
-              // if (ulSelCnt) {
               memset(&ri, 0, sizeof(RECORDINSERT));
               ri.cb = sizeof(RECORDINSERT);
@@ -1323 +1321 @@
               strcmp(szFSType, NDFS32) &&
               strcmp(szFSType, RAMFS) &&
-              strcmp(szFSType, NTFS) &&
+              strcmp(szFSType, NTFS) &&
               strcmp(szFSType, HPFS386)) {
             driveflags[x] |= DRIVE_NOLONGNAMES;
@@ -1330 +1328 @@
           if (!strcmp(szFSType, CDFS) || !strcmp(szFSType,ISOFS)) {
             removable = 1;
-            driveflags[x] |= DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE |
-                             DRIVE_CDROM;
+            driveflags[x] |= DRIVE_REMOVABLE | DRIVE_NOTWRITEABLE | DRIVE_CDROM;
           }
-          else if (!stricmp(szFSType, CBSIFS)) {
+          if (!stricmp(szFSType, CBSIFS)) {
             driveflags[x] |= DRIVE_ZIPSTREAM;
             driveflags[x] &= ~DRIVE_REMOTE;
@@ -1340 +1337 @@
             if (!(ulDriveType & DRIVE_NOLONGNAMES))
               driveflags[x] &= ~DRIVE_NOLONGNAMES;
-          }
+          }
 
           pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
-          // if ((ULONG) (toupper(*pci->pszFileName) - '@') == ulCurDriveNum)   // 23 Jul 07 SHL
           if ((ULONG)(toupper(*szDrive) - '@') == ulCurDriveNum)
             pci->rc.flRecordAttr |= (CRA_CURSORED | CRA_SELECTED);
@@ -1370 +1366 @@
               sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
               pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-              //strcpy(pci->pszFileName, szDrive);
               pci->pszDisplayName = pci->pszFileName;
               pci->rc.pszIcon = pci->pszDisplayName;
@@ -1383 +1378 @@
             // Removable volume
             pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-            //strcpy(pci->pszFileName, szDrive);
             pci->pszDisplayName = pci->pszFileName;
             pci->rc.pszIcon = pci->pszDisplayName;
@@ -1398 +1392 @@
           pci->rc.hptrIcon = hptrDunno;
           pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-          // strcpy(pci->pszFileName, szDrive); // 22 Jul 08 SHL No need to do this twice
 #         ifdef FORTIFY
           // Will be freed by TreeCnrWndProc WM_DESTROY
@@ -1414 +1407 @@
         pci->rc.hptrIcon = hptrFloppy;
         pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-        //strcpy(pci->pszFileName, szDrive);
         pci->pszDisplayName = pci->pszFileName;
         pci->rc.pszIcon = pci->pszDisplayName;
@@ -1486 +1478 @@
       pciParent->flags |= RECFLAGS_ENV;
       pciParent->pszFileName = xstrdup(GetPString(IDS_ENVVARSTEXT), pszSrcFile, __LINE__);
-      //strcpy(pciParent->pszFileName, GetPString(IDS_ENVVARSTEXT));
       pciParent->pszDisplayName = pciParent->pszFileName;       // 03 Aug 07 SHL
       pciParent->rc.hptrIcon = hptrEnv;

trunk/dll/filter.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2007 Steven H.Levine
+  Copyright (c) 2004, 2008 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage

trunk/dll/findrec.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2007 Steven H.Levine
+  Copyright (c) 2003, 2008 Steven H.Levine
 
   Find records

trunk/dll/fm2cmd.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2007 Steven H.Levine
+  Copyright (c) 2003, 2008 Steven H.Levine
 
   Command processing

trunk/dll/fsopen.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2007 Steven H. Levine
+  Copyright (c) 2007 2008 Steven H. Levine
 
   15 Oct 02 SHL Baseline

trunk/dll/getnames.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2006 Steven H. Levine
+  Copyright (c) 2006, 2008 Steven H. Levine
 
   23 Aug 06 SHL Comments

trunk/dll/info.c

@@ -825 +825 @@
           fp = _fsopen(pfs->szFileName, "rb", SH_DENYNO);
           if (fp) {
-            // char buff[512];
             char buff[4096];            // 06 Oct 07 SHL protect against NTFS defect
             ULONG len;