Changeset 838 for trunk/dll/copyf.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/copyf.c (modified) (6 diffs)

trunk/dll/copyf.c

@@ -363 +363 @@
 
   DosError(FERR_DISABLEHARDERR);
-  if (!DosFindFirst(oldname)) {
+  if (!xDosFindFirst(oldname)) {
     do {
 
@@ -383 +383 @@
         rc = docopyf(type,, "%s",);     /* copy file */
       DosError(FERR_DISABLEHARDERR);
-    } while (!rc && !DosFindNext());
+    } while (!rc && !xDosFindNext());
     DosFindClose(hdir);
   }
@@ -747 +747 @@
 
   DosError(FERR_DISABLEHARDERR);
-  if (!DosFindFirst(str, &search_handle, FILE_NORMAL | FILE_DIRECTORY |
-                    FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN | FILE_ARCHIVED,
-                    f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+  if (!xDosFindFirst(str, &search_handle, FILE_NORMAL | FILE_DIRECTORY |
+                     FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN | FILE_ARCHIVED,
+                     f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
 
     strcpy(ss, s);
@@ -779 +779 @@
       num_matches = 1L;
       DosError(FERR_DISABLEHARDERR);
-    } while (!DosFindNext(search_handle, f, sizeof(FILEFINDBUF3),
-                          &num_matches));
+    } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3),
+                           &num_matches));
     DosFindClose(search_handle);
   }
@@ -838 +838 @@
 
   search_handle = HDIR_CREATE;
-  num_matches = 1L;
+  num_matches = 1;
 
   DosError(FERR_DISABLEHARDERR);
-  if (!DosFindFirst(str, &search_handle, FILE_NORMAL, f,
-                    sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+  if (!xDosFindFirst(str, &search_handle, FILE_NORMAL, f,
+                     sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
 
     strcpy(ss, s);
@@ -850 +850 @@
       strcpy(p, f->achName);
       unlinkf("%s", ss);
-      num_matches = 1L;
+      num_matches = 1;
       DosError(FERR_DISABLEHARDERR);
-    } while (!DosFindNext(search_handle, f, sizeof(FILEFINDBUF3),
-                          &num_matches));
+    } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3),
+                           &num_matches));
     DosFindClose(search_handle);
   }