Changeset 1900 for trunk/dll/comp.c

Timestamp:

May 29, 2024, 10:03:01 PM (15 months ago)

Author:

Gregg Young

Message:

Fix ticket #575 spurious display of 00/00/00 date 0 eas and 0 time in compare directories on files that don't exist in one of the directories

File:

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

trunk/dll/comp.c

@@ -153 +153 @@
 #include "worker.h"                     // MOVEIT
 #include "rename.h"                     // RenameProc
+
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
+#include "PMPRINTF.H"
+#endif
 
 typedef struct
@@ -1987 +1992 @@
             x = +1;                     // Right side list longer
 
-          if (x <= 0) {
+          if (x <= 0) {
             // File appears on left side
             cmp->cmp->totalleft++;
@@ -1996 +2001 @@
             pcil->attrFile = filesl[l]->attrFile;
             pcil->pszDispAttr = FileAttrToString(pcil->attrFile);
-            pcil->cbFile = filesl[l]->cbFile;
+            pcil->cbFile =  filesl[l]->cbFile;
             // 12 Jan 08 SHL FIXME to use cached size here too
             CommaFmtULL(szBuf, sizeof(szBuf), pcil->cbFile, ' ');
@@ -2020 +2025 @@
             pcil->crtime.hours = filesl[l]->crtime.hours;
             DosRequestMutexSem(hmtxFiltering, SEM_INDEFINITE_WAIT);
-            if (cmp && *cmp->dcd.mask.szMask) {
+            if (cmp && *cmp->dcd.mask.szMask) {
               if (!Filter((PMINIRECORDCORE)pcil, (PVOID)&cmp->dcd.mask)) {
                 pcil->rc.flRecordAttr |= CRA_FILTERED;
@@ -2139 +2144 @@
           if (!pcil->pszFileName) {
             pcil->pszFileName = NullStr;
-            pcil->pszDisplayName = pcil->pszFileName;
+            pcil->pszDisplayName = pcil->pszFileName;
           }
 
           if (!pcir->pszFileName) {
             pcir->pszFileName = NullStr;
-            pcir->pszDisplayName = pcir->pszFileName;
+            pcir->pszDisplayName = pcir->pszFileName;
           }
 
@@ -2596 +2601 @@
         // 01 Aug 07 SHL if field null or blank, we draw
         // FIXME to document why - probably to optimize and bypass draw?
-        if (pci && (INT)pci != -1 && !*pci->pszFileName && pci->pszFileName != NullStr)
+        if (pci && (INT)pci != -1 && !*pci->pszFileName)
           return MRFROMLONG(TRUE);
       }