Changeset 1673 for trunk/dll/valid.c

Timestamp:

Dec 30, 2012, 7:51:01 PM (13 years ago)

Author:

Gregg Young

Message:

Update to Doxygen comment style Ticket 55. Also some minor code cleanup.

File:

• trunk/dll/valid.c (modified) (9 diffs)

trunk/dll/valid.c

@@ -92 +92 @@
 APIRET MakeFullName(char *pszFileName)
 {
-  /* pszFileName must be CCHMAXPATH long minimum! */
+  // pszFileName must be CCHMAXPATH long minimum!
 
   char szPathName[CCHMAXPATH];
@@ -117 +117 @@
     p = (p) ? (pp) ? (p > pp) ? p : pp : p : pp;
   }
-  if (!p)                               /* name is itself a root */
+  if (!p)                               // name is itself a root
     p = filename;
-  else                                  /* skip past backslash */
+  else                                  // skip past backslash
     p++;
   return p;
@@ -220 +220 @@
 BOOL IsNewer(char *file1, char *file2)
 {
-  /* return TRUE if file2 is newer than file1 */
+  // return TRUE if file2 is newer than file1
 
   return (TestFDates(file1, file2, NULL, NULL, NULL, NULL) > 0);
@@ -319 +319 @@
                         (PFSQBUFFER2) pvBuffer, &clBufferSize);
   if (rc) {
-    /* can't get any info at all */
+    // can't get any info at all
     DosFreeMem(pvBuffer);
     DosError(FERR_DISABLEHARDERR);
@@ -411 +411 @@
   NonRemovable = 1;                     // Preset as non removable
   DosError(FERR_DISABLEHARDERR);
-  rc = DosDevIOCtl(hDev, IOCTL_DISK, DSK_BLOCKREMOVABLE, &parmPkt.Cmd,  /* Address of the command-specific argument list. */
-                   sizeof(parmPkt.Cmd), /* Length, in bytes, of pParams. */
-                   &clParmBytes,        /* Pointer to the length of parameters. */
-                   &NonRemovable,       /* Address of the data area. */
-                   sizeof(NonRemovable),        /* Length, in bytes, of pData. */
-                   &clDataBytes);       /* Pointer to the length of data. */
+  rc = DosDevIOCtl(hDev, IOCTL_DISK, DSK_BLOCKREMOVABLE, &parmPkt.Cmd, // Address of the command-specific argument list.
+                   sizeof(parmPkt.Cmd), // Length, in bytes, of pParams.
+                   &clParmBytes,        // Pointer to the length of parameters.
+                   &NonRemovable,       // Address of the data area.
+                   sizeof(NonRemovable),// Length, in bytes, of pData.
+                   &clDataBytes);       // Pointer to the length of data.
 
   if (!rc && NonRemovable) {
@@ -424 +424 @@
     memset(&dataPkt, 0xff, sizeof(dataPkt));
     DosError(FERR_DISABLEHARDERR);
-    rc = DosDevIOCtl(hDev, IOCTL_DISK, DSK_GETDEVICEPARAMS, &parmPkt.Cmd,       /* Address of the command-specific argument list. */
-                     sizeof(parmPkt.Cmd),       /* Length, in bytes, of pParams. */
-                     &clParmBytes,      /* Pointer to the length of parameters. */
-                     &dataPkt,          /* Address of the data area. */
-                     sizeof(dataPkt),   /* Length, in bytes, of pData. */
-                     &clDataBytes);     /* Pointer to the length of data. */
+    rc = DosDevIOCtl(hDev, IOCTL_DISK, DSK_GETDEVICEPARAMS, &parmPkt.Cmd,// Address of the command-specific argument list.
+                     sizeof(parmPkt.Cmd),       // Length, in bytes, of pParams.
+                     &clParmBytes,              // Pointer to the length of parameters.
+                     &dataPkt,                  // Address of the data area.
+                     sizeof(dataPkt),           // Length, in bytes, of pData.
+                     &clDataBytes);             // Pointer to the length of data.
 
     if (!rc && (dataPkt.bpb.fsDeviceAttr & BPB_REMOVABLE_MEDIA))
@@ -448 +448 @@
 BOOL IsFileSame(CHAR * filename1, CHAR * filename2)
 {
-  /* returns: -1 (error), 0 (is a directory), or 1 (is a file) */
+  // returns: -1 (error), 0 (is a directory), or 1 (is a file)
 
   FILESTATUS3L fsa1, fsa2;
@@ -492 +492 @@
       return 0;
   }
-  return -1;                            /* error; doesn't exist or can't read or null filename */
+  return -1;                            // error; doesn't exist or can't read or null filename
 }
 
@@ -1080 +1080 @@
   *objectpath = 0;
   if (OS2ver[0] > 20 || (OS2ver[0] == 20 && OS2ver[1] >= 30)) {
-    /*
+    /**
      * if running under warp, we can get the desktop name
      * this way...