Changeset 838 for trunk/dll/init.c

Timestamp:

Sep 21, 2007, 9:19:18 PM (18 years ago)

Author:

Gregg Young

Message:

Remainder of changes for xDosFindFirst/Next wrapper performance test

File:

• trunk/dll/init.c (modified) (6 diffs)

trunk/dll/init.c

@@ -92 +92 @@
   if (*SwapperDat) {
     nm = 1;
-    rc = DosFindFirst(SwapperDat,
-                      &hdir,
-                      FILE_NORMAL | FILE_ARCHIVED |
-                      FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                      &ffb, sizeof(ffb), &nm, FIL_STANDARD);
+    rc = xDosFindFirst(SwapperDat,
+                       &hdir,
+                       FILE_NORMAL | FILE_ARCHIVED |
+                       FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                       &ffb, sizeof(ffb), &nm, FIL_STANDARD);
     if (!rc) {
       DosFindClose(hdir);
@@ -153 +153 @@
               hdir = HDIR_CREATE;
               nm = 1;
-              if (!DosFindFirst(SwapperDat,
-                                &hdir,
-                                FILE_NORMAL | FILE_ARCHIVED |
-                                FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                                &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
+              if (!xDosFindFirst(SwapperDat,
+                                 &hdir,
+                                 FILE_NORMAL | FILE_ARCHIVED |
+                                 FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                                 &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
                 DosFindClose(hdir);
                 PrfWriteProfileString(fmprof,
@@ -444 +444 @@
     search_handle = HDIR_CREATE;
     num_matches = 1L;
-    if (!DosFindFirst(s,
-                      &search_handle,
-                      FILE_NORMAL | FILE_DIRECTORY |
-                      FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
-                      FILE_ARCHIVED,
-                      &f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+    if (!xDosFindFirst(s,
+                       &search_handle,
+                       FILE_NORMAL | FILE_DIRECTORY |
+                       FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
+                       FILE_ARCHIVED,
+                       &f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
       do {
         strcpy(enddir, f.achName);
@@ -459 +459 @@
           unlinkf("%s", s);
       }
-      while (!DosFindNext(search_handle,
-                          &f, sizeof(FILEFINDBUF3), &num_matches));
+      while (!xDosFindNext(search_handle,
+                           &f, sizeof(FILEFINDBUF3), &num_matches));
       DosFindClose(search_handle);
     }
@@ -472 +472 @@
   strcat(s, "???");
   search_handle = HDIR_CREATE;
-  num_matches = 1L;
-  if (!DosFindFirst(s,
-                    &search_handle,
-                    FILE_NORMAL | FILE_DIRECTORY |
-                    FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
-                    FILE_ARCHIVED,
-                    &f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+  num_matches = 1;
+  if (!xDosFindFirst(s,
+                     &search_handle,
+                     FILE_NORMAL | FILE_DIRECTORY |
+                     FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
+                     FILE_ARCHIVED,
+                     &f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
     do {
       if (!(f.attrFile & FILE_DIRECTORY)) {
@@ -485 +485 @@
       }
     }
-    while (!DosFindNext(search_handle,
-                        &f, sizeof(FILEFINDBUF3), &num_matches));
+    while (!xDosFindNext(search_handle,
+                         &f, sizeof(FILEFINDBUF3), &num_matches));
     DosFindClose(search_handle);
   }