Changeset 859

Timestamp:

Nov 5, 2007, 11:32:39 PM (18 years ago)

Author:

Gregg Young

Message:

Changed display logic so CommaFmtULL is used both with and without large file support for file size display. GiB notation can actually be selected in the source (in addition to being used automatically on very large drives).

Location:

trunk/dll

Files:

• commafmt.c (modified) (1 diff)
• filldir.c (modified) (2 diffs)
• misc.c (modified) (1 diff)

trunk/dll/commafmt.c

@@ -98 +98 @@
     ullNumber = (ullNumber + 1023) >> 10;
     chSuffix = 'K';
-    if (ullNumber >= 1ULL << 31 || (chPreferred == 'M' && ullNumber >= 1024)) {
+    if (ullNumber >= 1ULL << 31 || (chPreferred == 'M' && ullNumber >= 1024) ||
+        (chPreferred == 'G' && ullNumber >= 1024)) {
       ullNumber = (ullNumber + 1023) >> 10;
       chSuffix = 'M';

trunk/dll/filldir.c

@@ -426 +426 @@
 
   //comma format the file size for large file support
-  if(!fNoLargeFileSupport){
+  {
   CHAR szBuf[30];
     CommaFmtULL(szBuf, sizeof(szBuf), pffb->cbFile, ' ');
@@ -646 +646 @@
 
   //comma format the file size for large file support
-
-  if(!fNoLargeFileSupport){
-    CHAR szBuf[30];
+  {
+  CHAR szBuf[30];
     CommaFmtULL(szBuf, sizeof(szBuf), pfsa4->cbFile, ' ');
     pci->pszFmtFileSize = xstrdup(szBuf, pszSrcFile, __LINE__);

trunk/dll/misc.c

@@ -553 +553 @@
     // Fill in column information for the file size
 
-    if(fNoLargeFileSupport) {
-      pfi = pfi->pNextFieldInfo;
-      pfi->flData = CFA_ULONG | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
-      pfi->flTitle = CFA_CENTER;
-      pfi->pTitleData = GetPString(IDS_SIZE);
-      pfi->offStruct = FIELDOFFSET(CNRITEM, cbFile);
-    }
-    else {
-      pfi = pfi->pNextFieldInfo;
-      pfi->flData = CFA_STRING | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
-      pfi->flTitle = CFA_CENTER;
-      pfi->pTitleData = GetPString(IDS_SIZE);
-      pfi->offStruct = FIELDOFFSET(CNRITEM, pszFmtFileSize);
-    }
+
+    pfi = pfi->pNextFieldInfo;
+    pfi->flData = CFA_STRING | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
+    pfi->flTitle = CFA_CENTER;
+    pfi->pTitleData = GetPString(IDS_SIZE);
+    pfi->offStruct = FIELDOFFSET(CNRITEM, pszFmtFileSize);
+
 
     // Fill in the column information for the file's ea size