Changeset 860 for trunk/dll/commafmt.c

Timestamp:

Nov 10, 2007, 11:58:43 PM (18 years ago)

Author:

Gregg Young

Message:

Use the thousand separator from NLS Country info for file sizes. Repalce dir.ico & pmap.bmp with new versions from David

File:

• trunk/dll/commafmt.c (modified) (5 diffs)

trunk/dll/commafmt.c

@@ -13 +13 @@
   25 May 05 SHL Add CommaFmtULL, CommaFmtUL
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  05 Nov 07 GKY Use commafmtULL to display file sizes for large file support
+  10 Nov 07 GKY Get thousands separator from country info for file sizes.
 
 ***********************************************************************/
 
 /*
-   **  COMMAFMT.C
-   **  Public domain by Bob Stout
-   **
-   **  Notes:  1. Use static buffer to eliminate error checks on buffer overflow
-   **             and reduce code size.
-   **          2. By making the numeric argument a long and prototyping it before
-   **             use, passed numeric arguments will be implicitly cast to longs
-   **             thereby avoiding int overflow.
-   **          3. Use the thousands grouping and thousands separator from the
-   **             ANSI locale to make this more robust.
+ * COMMAFMT.C
+ * Adapted from public domain code by Bob Stout
+ *
+ *         2. By making the numeric argument a long and prototyping it before
+ *            use, passed numeric arguments will be implicitly cast to longs
+ *            thereby avoiding int overflow.
+ *         3. Use the thousands grouping and thousands separator from the
+ *            ANSI locale to make this more robust.
  */
 
+#define INCL_WIN
 #define INCL_LONGLONG
 #include <os2.h>
@@ -35 +36 @@
 #include <stdio.h>
 #include <string.h>
+#include "fm3dll.h"
 
 size_t commafmt(char *pszBuf,   // Output buffer
@@ -57 +59 @@
 
   for (; cChars <= cBufSize; ++cChars, ++cDigits) {
-    *pch-- = (CHAR) (lNumber % 10 + '0');
+    *pch-- = (CHAR)(lNumber % 10 + '0');
     lNumber /= 10;
     if (!lNumber)
       break;
     if (cDigits % 3 == 0) {
-      *pch-- = ',';
+      *pch-- = *ThousandsSeparator;
       ++cChars;
     }
@@ -85 +87 @@
 }
 
-//=== CommaFmtULL: format long long number with commas and SI unit suffix ===
+/**
+ * Format long long number with commas and SI unit suffix
+ * @param pszBuf Points to output buffer
+ * @param cBufSize Buffer size including space for terminating nul
+ * @param ullNumber Number to convert
+ * @param chPreferred Preferred suffix, blank, K, M
+ * @return size of formatting string excluding terminating nul
+ */
 
 size_t CommaFmtULL(char *pszBuf,        // Output buffer
@@ -109 +118 @@
   }
 
-  c = commafmt(pszBuf, cBufSize, (LONG) ullNumber);
+  c = commafmt(pszBuf, cBufSize, (LONG)ullNumber);
 
   if (chSuffix != ' ') {