Changeset 827 for trunk/dll/copyf.c

Timestamp:

Sep 2, 2007, 8:32:14 PM (18 years ago)

Author:

Steven Levine

Message:

Future proof xDosSetPathInfo
Clean up callers

File:

• trunk/dll/copyf.c (modified) (7 diffs)

trunk/dll/copyf.c

@@ -17 +17 @@
   14 Jul 06 SHL Use Runtime_Error
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
-  01 Sep 07 GKY Add xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
+  01 Sep 07 GKY Use xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundry
 
 ***********************************************************************/
@@ -300 +300 @@
     eaop.oError = 0L;
     DosError(FERR_DISABLEHARDERR);
-    rc = xDosSetPathInfo(filename,
-                        FIL_QUERYEASIZE,
-                        (PVOID) & eaop, (ULONG) sizeof(EAOP2), DSPI_WRTTHRU);
+    rc = xDosSetPathInfo(filename, FIL_QUERYEASIZE,
+                         &eaop, sizeof(eaop), DSPI_WRTTHRU);
     DosFreeMem(pfealist);
     if (rc)
@@ -314 +313 @@
   BOOL ret = FALSE;
 
-  /* NOTE:  newname should be CCHMAXPATH chars long! */
+  /* NOTE: newname should be CCHMAXPATH chars long! */
 
   if (strchr(newname, '*') || strchr(newname, '?')) {
@@ -375 +374 @@
 
           /* truncate directory name */
-          /* create that directory   */
+          /* create that directory */
           /* update containers for name used */
 
@@ -402 +401 @@
    *  -2:  source didn't exist
    *  -3:  bad type
-   *   anything else:  API return
+   *   anything else: API return
    */
 
@@ -665 +664 @@
 
   DosError(FERR_DISABLEHARDERR);
-  if (!DosQueryPathInfo(filename, FIL_STANDARD, &fsi, sizeof(FILESTATUS3))) {
+  if (!DosQueryPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi))) {
     fsi.attrFile = 0;
     DosError(FERR_DISABLEHARDERR);
-    if (!xDosSetPathInfo(filename,
-                        FIL_STANDARD, &fsi, sizeof(FILESTATUS3), 0L))
+    if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
       ret = 0;
   }
@@ -675 +673 @@
 }
 
-INT wipeallf(CHAR * string, ...)
+INT wipeallf(CHAR *string, ...)
 {
   /* unlink everything from directory on down... */