Changeset 897 for trunk/dll/comp.c

Timestamp:

Dec 31, 2007, 12:34:00 AM (18 years ago)

Author:

Gregg Young

Message:

Use CommaFmtULL for additional file, EA etc sizes display; Modify/Create TestFDates & TestCDates for comparing/sorting files or CNRITEMS by date/time.

File:

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

trunk/dll/comp.c

@@ -39 +39 @@
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
   27 Sep 07 SHL Correct ULONGLONG size formatting
+  30 Dec 07 GKY Use TestCDates for compare by file date/time
 
 ***********************************************************************/
@@ -931 +932 @@
       INT numallocl = 0;
       INT numallocr = 0;
+      INT ret = 0;
       UINT lenl;                        // Directory prefix length
       UINT lenr;
@@ -1289 +1291 @@
               strcpy(pch, GetPString(IDS_SMALLERTEXT));
               pch += 7;
-            }
-            if ((pcil->date.year > pcir->date.year) ? TRUE :
+            }
+            ret = TestCDates(&pcir->date, &pcir->time,
+                             &pcil->date, &pcil->time);
+            if (ret == 1)
+              /*((pcil->date.year > pcir->date.year) ? TRUE :
                 (pcil->date.year < pcir->date.year) ? FALSE :
                 (pcil->date.month > pcir->date.month) ? TRUE :
@@ -1301 +1306 @@
                 (pcil->time.minutes < pcir->time.minutes) ? FALSE :
                 (pcil->time.seconds > pcir->time.seconds) ? TRUE :
-                (pcil->time.seconds < pcir->time.seconds) ? FALSE : FALSE) {
+                (pcil->time.seconds < pcir->time.seconds) ? FALSE : FALSE)*/ {
               pcil->flags |= CNRITEM_NEWER;
               pcir->flags |= CNRITEM_OLDER;
@@ -1311 +1316 @@
               pch += 5;
             }
-            else if ((pcil->date.year < pcir->date.year) ? TRUE :
+            else if (ret == -1)
+              /*((pcil->date.year < pcir->date.year) ? TRUE :
                      (pcil->date.year > pcir->date.year) ? FALSE :
                      (pcil->date.month < pcir->date.month) ? TRUE :
@@ -1323 +1329 @@
                      (pcil->time.seconds < pcir->time.seconds) ? TRUE :
                      (pcil->time.seconds > pcir->time.seconds) ? FALSE :
-                     FALSE) {
+                     FALSE)*/ {
               pcil->flags |= CNRITEM_OLDER;
               pcir->flags |= CNRITEM_NEWER;