Changeset 857

Timestamp:

Nov 4, 2007, 9:58:30 PM (18 years ago)

Author:

Gregg Young

Message:

Free strdup memory for large file size formatting Add GiB label to CommaFmtULL

Location:

trunk/dll

Files:

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

trunk/dll/commafmt.c

@@ -90 +90 @@
                    UINT cBufSize,       // Buffer size, including nul
                    ULONGLONG ullNumber, // Number to convert
-                   CHAR chPreferred)    // Preferred suffix, blank, K, M
+                   CHAR chPreferred)    // Preferred suffix, blank, K, M, G
 {
   CHAR chSuffix = ' ';
@@ -101 +101 @@
       ullNumber = (ullNumber + 1023) >> 10;
       chSuffix = 'M';
+      if (ullNumber >= 1ULL << 31 || (chPreferred == 'G' && ullNumber >= 1024)) {
+        ullNumber = (ullNumber + 1023) >> 10;
+        chSuffix = 'G';
+      }
     }
   }

trunk/dll/filldir.c

@@ -1598 +1598 @@
     free(psz);
   }
+
+  if (pci->pszFmtFileSize && pci->pszFmtFileSize != NullStr) {
+    psz = pci->pszFmtFileSize;
+    pci->pszFmtFileSize = NullStr;
+    free(psz);
+  }
 }