Changeset 761 for trunk/dll

Timestamp:

Aug 5, 2007, 12:38:34 AM (18 years ago)

Author:

Gregg Young

Message:

Cleanup of FilesToGet changes (ticket 138)

Location:

trunk/dll

Files:

• datamin.c (modified) (1 diff)
• dircnrs.c (modified) (1 diff)
• dirsize.c (modified) (4 diffs)
• flesh.c (modified) (4 diffs)
• inis.c (modified) (2 diffs)
• objcnr.c (modified) (6 diffs)
• saveclip.c (modified) (2 diffs)
• seeall.c (modified) (3 diffs)
• treecnr.c (modified) (2 diffs)
• update.c (modified) (1 diff)

trunk/dll/datamin.c

@@ -743 +743 @@
       CHAR s[134], szFileQty[38], szFreeQty[38];
       FILEFINDBUF3 ffb;
-      ULONG nm = 1L;
+      ULONG nm = 1;
       ULONGLONG ullFreeQty;
       HDIR hdir = HDIR_CREATE;

trunk/dll/dircnrs.c

@@ -3130 +3130 @@
           FILEFINDBUF3 ffb;
           HDIR hDir = HDIR_CREATE;
-          ULONG nm = 1L;
+          ULONG nm = 1;
           APIRET status = 0;
 

trunk/dll/dirsize.c

@@ -115 +115 @@
 
   hdir = HDIR_CREATE;
-  nm = 1;
+  nm = 128;
   memset(pffb, 0, sizeof(FILEFINDBUF4));
   DosError(FERR_DISABLEHARDERR);
@@ -198 +198 @@
   ri.pRecordParent = (PRECORDCORE) pciParent;
   ri.zOrder = (USHORT) CMA_TOP;
-  ri.cRecordsInsert = 1;
+  ri.cRecordsInsert = 128;
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
@@ -205 +205 @@
   }
   hdir = HDIR_CREATE;
-  nm = 1;
+  nm = 128;
   rc = DosFindFirst(maskstr, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
@@ -250 +250 @@
         break;
       DosSleep(1);
-      nm = 1;                           /* FilesToGet */
+      nm = 128;                         /* FilesToGet */
       rc = DosFindNext(hdir, pffb, sizeof(FILEFINDBUF4), &nm);
     }                                   // while more found

trunk/dll/flesh.c

@@ -228 +228 @@
   PFILEFINDBUF3 pffb;
   HDIR hDir = HDIR_CREATE;
-  ULONG nm, ulM = 1L, total = 0L, fl = MUST_HAVE_DIRECTORY;
+  ULONG nm, ulM = 1, total = 0, fl = MUST_HAVE_DIRECTORY;
   CHAR str[CCHMAXPATH];
   register INT len;
   APIRET rc, prc;
   BOOL isadir = FALSE, isremote = FALSE, includefiles = fFilesInTree;
-  ULONG ddepth = 3L;
+  ULONG ddepth = 3;
   static BOOL brokenlan = FALSE, isbroken = FALSE;
 
@@ -269 +269 @@
         ddepth--;
       }
-      ulM = 1L;
+      ulM = 1;
     }
   }
@@ -289 +289 @@
                     FILE_SYSTEM | FILE_HIDDEN,
                     &ffb, ulM * sizeof(FILEFINDBUF3), &nm, FIL_STANDARD);
-  if (ulM == 1L && !rc) {
+  if (ulM == 1 && !rc) {
     do {
       pffb = &ffb[0];
@@ -331 +331 @@
         goto Interruptus;
       }
-      nm = 1L;
+      nm = 1;
       DosError(FERR_DISABLEHARDERR);
     } while (++total < ddepth && !(rc = (DosFindNext(hDir,

trunk/dll/inis.c

@@ -523 +523 @@
 
       hdir = HDIR_CREATE;
-      nm = 1L;
+      nm = 1;
       DosError(FERR_DISABLEHARDERR);
       if (!DosFindFirst("*.IST",
@@ -534 +534 @@
                             MPFROMSHORT(LIT_SORTASCENDING),
                             MPFROMP(ffb.achName));
-          nm = 1L;
+          nm = 1;
         } while (!DosFindNext(hdir, &ffb, sizeof(ffb), &nm));
         DosFindClose(hdir);

trunk/dll/objcnr.c

@@ -79 +79 @@
   strcat(maskstr, "*");
   hdir = HDIR_CREATE;
-  nm = 1L;
+  nm = 128;
   rc = DosFindFirst(filename, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
@@ -96 +96 @@
                       CM_ALLOCRECORD,
                       MPFROMLONG(EXTRA_RECORD_BYTES),
-                      MPFROMLONG(1L));
+                      MPFROMLONG(1));
     if (!pciP) {
       free(ffb);
@@ -145 +145 @@
   ri.pRecordParent = (PRECORDCORE) pciParent;
   ri.zOrder = (USHORT) CMA_TOP;
-  ri.cRecordsInsert = 1L;
+  ri.cRecordsInsert = 128;
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pciP), MPFROMP(&ri))) {
@@ -154 +154 @@
   if (!isalpha(*maskstr) || maskstr[1] != ':' || maskstr[2] != '\\' ||
       ((driveflags[toupper(*maskstr) - 'A'] & DRIVE_REMOTE) && fRemoteBug))
-    ulM = 1L;
+    ulM = 1;
   else
     ulM = FilesToGet;
-  if (ulM > 1L) {
+  if (ulM > 1) {
     fft = xrealloc(ffb, sizeof(FILEFINDBUF3) * ulM, pszSrcFile, __LINE__);
     if (!fft)
-      ulM = 1L;
+      ulM = 1;
     else
       ffb = fft;
@@ -176 +176 @@
 
     while (!rc) {
-      for (x = 0L; x < nm; x++) {
+      for (x = 0; x < nm; x++) {
         pffbFile = (FILEFINDBUF3 *) fb;
         if (*stopflag)
@@ -192 +192 @@
         fb += pffbFile->oNextEntryOffset;
       }
-      DosSleep(0L);
+      DosSleep(1);
       if (*stopflag)
         break;

trunk/dll/saveclip.c

@@ -718 +718 @@
         ULONG nm;
         HDIR hdir;
-        CHAR longname[CCHMAXPATH], subject[42];
+        CHAR longname[CCHMAXPATH], subject[256];
 
         *pattern = 0;
@@ -790 +790 @@
             while (list[x]) {
               hdir = HDIR_CREATE;
-              nm = 1L;
+              nm = 1;
               *subject = *longname = 0;
               if (!DosFindFirst(list[x], &hdir,

trunk/dll/seeall.c

@@ -1437 +1437 @@
         didone = TRUE;
         hdir = HDIR_CREATE;
-        nm = 1L;
+        nm = 1;
         if (!DosFindFirst(list[z], &hdir, FILE_NORMAL | FILE_ARCHIVED |
                           FILE_DIRECTORY | FILE_READONLY | FILE_SYSTEM |
@@ -1458 +1458 @@
         didone = TRUE;
         hdir = HDIR_CREATE;
-        nm = 1L;
+        nm = 1;
         if (!DosFindFirst(list[z], &hdir, FILE_NORMAL | FILE_ARCHIVED |
                           FILE_DIRECTORY | FILE_READONLY | FILE_SYSTEM |
@@ -1907 +1907 @@
       pathname[2] == '\\' &&
       (driveflags[toupper(*pathname) - 'A'] & DRIVE_REMOTE))
-    uL = 1L;
+    uL = 1;
   pffb = xmalloc(sizeof(FILEFINDBUF3) * uL, pszSrcFile, __LINE__);
   if (!pffb) {

trunk/dll/treecnr.c

@@ -937 +937 @@
         hwndStatus2) {
       FILEFINDBUF3 ffb;
-      ULONG nm = 1L;
+      ULONG nm = 1;
       HDIR hdir = HDIR_CREATE;
 
@@ -1705 +1705 @@
       FILEFINDBUF3 ffb;
       HDIR hDir = HDIR_CREATE;
-      ULONG nm = 1L;
+      ULONG nm = 1;
       APIRET status;
       BOOL IsOk = FALSE;

trunk/dll/update.c

@@ -338 +338 @@
   FILEFINDBUF4 ffb;
   HDIR hDir;
-  ULONG nm = 1;
+  ULONG nm = (ULONG) howmany;
   INT x;
   INT numlist = 0;