Changeset 781 for trunk/dll/dirsize.c

Timestamp:

Aug 12, 2007, 5:04:05 AM (18 years ago)

Author:

Steven Levine

Message:

ProcessDir: remove unneeded reallocs

File:

• trunk/dll/dirsize.c (modified) (20 diffs)

trunk/dll/dirsize.c

@@ -28 +28 @@
   03 Aug 07 SHL DirSizeProc; correct sizing and positioning to be deterministic
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-
+  11 Aug 07 SHL ProcessDir: remove unneeded reallocs
 
 ***********************************************************************/
@@ -36 +36 @@
 #define INCL_GPI
 #define INCL_LONGLONG
+#define INCL_DOSERRORS
 #include <os2.h>
 
@@ -99 +100 @@
   ULONGLONG ull;
   HDIR hdir;
-  FILEFINDBUF4 *pffb, *pffbTemp;
+  FILEFINDBUF4 *pffb;
   APIRET rc;
   RECORDINSERT ri;
@@ -107 +108 @@
   *pullTotalBytes = 0;                  // In case we fail
 
-  pffb = xmalloc(sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
+  pffb = xmalloc(sizeof(FILEFINDBUF4) * FilesToGet, pszSrcFile, __LINE__);
   if (!pffb)
-    return FALSE;
+    return FALSE;                       // Error already reported
+
   strcpy(maskstr, pszFileName);
   if (maskstr[strlen(maskstr) - 1] != '\\')
@@ -115 +117 @@
   pEndMask = &maskstr[strlen(maskstr)]; // Point after last backslash
   strcat(maskstr, "*");
-  //printf("%s\n",maskstr);
 
   hdir = HDIR_CREATE;
   nm = 1;
+  // 11 Aug 07 SHL fixme to know if we can bypass memset
   memset(pffb, 0, sizeof(FILEFINDBUF4));
   DosError(FERR_DISABLEHARDERR);
-  //printf("FIND1\n");
+  // Check directory exists
   rc = DosFindFirst(pszFileName, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
@@ -156 +158 @@
     pci->pszDispAttr = NullStr;
     pci->pszSubject = NullStr;
-  }
+  } // if got something
   else {
+    // No match
     free(pffb);
-    Dos_Error(MB_ENTER,
-              rc,
-              HWND_DESKTOP,
-              pszSrcFile,
-              __LINE__, GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
     return FALSE;
   }
@@ -188 +188 @@
   // fixme to know why - it appears to be indirectly saving length, but why?
   pci->pszDisplayName = pci->pszFileName + strlen(pci->pszFileName);
-  pci->pszLongName = pci->pszFileName;          // fixme to be sure?
+  pci->pszLongName = pci->pszFileName;  // fixme to be sure?
   pci->rc.pszIcon = pci->pszFileName;
   pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
@@ -207 +207 @@
     return FALSE;
   }
+
+  // Find files and directories in this directory
   hdir = HDIR_CREATE;
-  pffbTemp = pffb;
   nm = FilesToGet;
-  pffb = xrealloc(pffb, (nm + 1) * sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
-  if (!pffb) { //Error already sent
-        free(pffbTemp);
-        return FALSE;
-      }
   rc = DosFindFirst(maskstr, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
                     FILE_SYSTEM | FILE_HIDDEN | FILE_DIRECTORY,
-                    pffb, (nm + 1) * sizeof(FILEFINDBUF4), &nm, FIL_QUERYEASIZE);
+                    pffb, nm * sizeof(FILEFINDBUF4), &nm, FIL_QUERYEASIZE);
   if (!rc) {
-    register PBYTE fb = (PBYTE) pffb;
+    PBYTE fb = (PBYTE)pffb;
     FILEFINDBUF4 *pffbFile;
     ULONG x;
-    UINT y = 1;
 
     while (!rc) {
       priority_normal();
-      //printf("Found %lu\n",nm);
       for (x = 0; x < nm; x++) {
-        pffbFile = (FILEFINDBUF4 *) fb;
-        //printf("%s\n",pffbFile->achName);
-        //fflush(stdout);
+        pffbFile = (FILEFINDBUF4 *)fb;
         // Total size skipping . and ..
         if ((~pffbFile->attrFile & FILE_DIRECTORY) ||
@@ -256 +248 @@
           break;
         fb += pffbFile->oNextEntryOffset;
-      }                                 // for matches
+      } // for matches
       if (*pchStopFlag)
-        break;
+        break;
       DosSleep(1);
-      pffbTemp = pffb;
-      nm = FilesToGet;                          /* FilesToGet */
-      y++;
-      pffb = xrealloc(pffb, y * (nm + 1) * sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
-      if (!pffb) { //Error already sent
-        free(pffbTemp);
-        break;
-      }
+      nm = FilesToGet;
       DosError(FERR_DISABLEHARDERR);
-      rc = DosFindNext(hdir, pffb, y * (nm + 1) * sizeof(FILEFINDBUF4), &nm);
-    }                                   // while more found
+      rc = DosFindNext(hdir, pffb, sizeof(FILEFINDBUF4) * FilesToGet, &nm);
+    } // while more found
+
+    if (rc != ERROR_NO_MORE_FILES) {
+      Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
+    }
+
     DosFindClose(hdir);
     priority_normal();
-  }
+  } // if got files or directories
 
   free(pffb);
@@ -323 +314 @@
         // Need unique buffer 23 Jul 07 SHL
         pci->pszLongName = xmalloc(2, pszSrcFile, __LINE__);
-        pci->pszLongName[0] = 0;                // Make null string
-        pci->pszLongName[1] = 1;                // Flag root - hack cough
+        pci->pszLongName[0] = 0;        // Make null string
+        pci->pszLongName[1] = 1;        // Flag root - hack cough
       }
       else
@@ -632 +623 @@
             p = strchr(pci->pszFileName, '\r');
             if (p) {
-              /* draw text */
-              if (!pci->cbFile)         /* no size */
+              // draw text
+              if (!pci->cbFile)         // no size
                 GpiSetColor(oi->hps, CLR_DARKGRAY);
-              else if (!pci->easize)    /* no size below */
+              else if (!pci->easize)    // no size below
                 GpiSetColor(oi->hps, CLR_DARKBLUE);
               else
@@ -656 +647 @@
               // Place text above graph box with a bit of whitespace between
               ptl.x = oi->rclItem.xLeft;
-              ptl.y = yBottom + boxHeight + 8;          // 03 Aug 07 SHL
+              ptl.y = yBottom + boxHeight + 8;  // 03 Aug 07 SHL
               // GpiMove(oi->hps, &ptl);
               GpiCharStringAt(oi->hps, &ptl, strlen(pci->pszFileName),
@@ -663 +654 @@
               *p = '\r';                // Restore
 
-              /* draw the graph box */
+              // draw the graph box
               // GpiQueryTextBox(oi->hps, 1, "#", TXTBOX_COUNT, aptl);  // 03 Aug 07 SHL
-              /* draw black outline */
+              // draw black outline
               GpiSetColor(oi->hps, CLR_BLACK);
               ptl.x = oi->rclItem.xLeft;
@@ -673 +664 @@
               ptl.y = yBottom + boxHeight;
               GpiBox(oi->hps, DRO_OUTLINE, &ptl, 0, 0);
-              /* fill with gray */
+              // fill with gray
               GpiSetColor(oi->hps, CLR_PALEGRAY);
               ptl.x = oi->rclItem.xLeft + 1;
@@ -682 +673 @@
               GpiBox(oi->hps, DRO_OUTLINEFILL, &ptl, 0, 0);
 
-              /* draw shadow at bottom & right sides */
+              // draw shadow at bottom & right sides
               GpiSetColor(oi->hps, CLR_DARKGRAY);
               ptl.x = oi->rclItem.xLeft + 1;
@@ -692 +683 @@
               GpiLine(oi->hps, &ptl);
 
-              /* draw highlight at top and left sides */
+              // draw highlight at top and left sides
               GpiSetColor(oi->hps, CLR_WHITE);
               ptl.x = oi->rclItem.xLeft + 1;
@@ -699 +690 @@
               GpiLine(oi->hps, &ptl);
 
-              /* draw shadow of box */
+              // draw shadow of box
               GpiSetColor(oi->hps, CLR_DARKGRAY);
               ptl.x = oi->rclItem.xLeft + 2;
@@ -715 +706 @@
               GpiLine(oi->hps, &ptl);
 
-              /* fill box with graph bar, flags is integer % */
+              // fill box with graph bar, flags is integer %
               if (pci->flags) {
-                if (*(pci->pszLongName + 1) == 1)       /* is root record */
+                if (*(pci->pszLongName + 1) == 1)       // is root record
                   GpiSetColor(oi->hps, CLR_DARKGREEN);
                 else
@@ -728 +719 @@
                 GpiBox(oi->hps, DRO_OUTLINEFILL, &ptl, 0, 0);
 
-                /* draw highlights and shadows on graph */
+                // draw highlights and shadows on graph
                 if (*(pci->pszLongName + 1) == 1)
                   GpiSetColor(oi->hps, CLR_GREEN);
@@ -756 +747 @@
               }
 
-              /* draw hash marks in box */
+              // draw hash marks in box
               GpiSetColor(oi->hps, CLR_WHITE);
               clr = CLR_WHITE;