Changeset 847 for trunk/dll/grep.c

Timestamp:

Sep 29, 2007, 8:45:16 PM (18 years ago)

Author:

Gregg Young

Message:

Removed large file APIs from code where hey are not needed.

File:

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

trunk/dll/grep.c

@@ -401 +401 @@
   // process all subdirectories
 
-  FILEFINDBUF4L ffb;
+  FILEFINDBUF4 ffb;
   HDIR findHandle = HDIR_CREATE;
   LONG ulFindCnt = 1;
@@ -412 +412 @@
   // step through all subdirectories
   DosError(FERR_DISABLEHARDERR);
-  if (!xDosFindFirst(searchPath, &findHandle, (MUST_HAVE_DIRECTORY |
-                     FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN | FILE_READONLY),
-                     &ffb, (ULONG) sizeof(ffb),
-                     (PULONG) & ulFindCnt, FIL_QUERYEASIZEL)) {
+  if (!DosFindFirst(searchPath, &findHandle, (MUST_HAVE_DIRECTORY |
+                    FILE_ARCHIVED | FILE_SYSTEM | FILE_HIDDEN | FILE_READONLY),
+                    &ffb, (ULONG) sizeof(ffb),
+                    (PULONG) & ulFindCnt, FIL_QUERYEASIZE)) {
 
     // get rid of mask portion, save end-of-directory
@@ -440 +440 @@
       }
       ulFindCnt = 1;
-    } while (!xDosFindNext(findHandle,
-                           &ffb,
-                           sizeof(ffb), (PULONG) & ulFindCnt));
+    } while (!DosFindNext(findHandle,
+                          &ffb,
+                          sizeof(ffb), (PULONG) & ulFindCnt));
     DosFindClose(findHandle);
     priority_normal();
@@ -454 +454 @@
   // process all matching files in a directory
 
-  PFILEFINDBUF4L pffbArray;
-  PFILEFINDBUF4L pffbFile;
+  PFILEFINDBUF4 pffbArray;
+  PFILEFINDBUF4 pffbFile;
   ULONG x;
   HDIR findHandle = HDIR_CREATE;
@@ -462 +462 @@
   PSZ p;
   APIRET rc;
-  ULONG ulBufBytes = FilesToGet * sizeof(FILEFINDBUF4L);
+  ULONG ulBufBytes = FilesToGet * sizeof(FILEFINDBUF4);
   static BOOL fDone;
 
@@ -488 +488 @@
   DosError(FERR_DISABLEHARDERR);
   ulFindCnt = FilesToGet;
-  rc = xDosFindFirst(szFindPath,
-                     &findHandle,
-                     FILE_NORMAL | grep->attrFile | grep->antiattr,
-                     pffbArray,
-                     ulBufBytes,
-                     &ulFindCnt,
-                     FIL_QUERYEASIZEL);
+  rc = DosFindFirst(szFindPath,
+                    &findHandle,
+                    FILE_NORMAL | grep->attrFile | grep->antiattr,
+                    pffbArray,
+                    ulBufBytes,
+                    &ulFindCnt,
+                    FIL_QUERYEASIZE);
   if (!rc) {
     do {
@@ -530 +530 @@
         if (!pffbFile->oNextEntryOffset)
           break;
-        pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+        pffbFile = (PFILEFINDBUF4)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
       } // for
       if (*grep->stopflag)
@@ -536 +536 @@
       DosSleep(0); //26 Aug 07 GKY 1
       ulFindCnt = FilesToGet;
-      rc = xDosFindNext(findHandle, pffbArray, ulBufBytes, &ulFindCnt);
+      rc = DosFindNext(findHandle, pffbArray, ulBufBytes, &ulFindCnt);
     } while (!rc);