Changeset 162 for trunk/dll/mainwnd.c

Timestamp:

May 26, 2005, 4:24:41 AM (20 years ago)

Author:

root

Message:

Use ULONGLONG and CommaFmtULL

File:

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

trunk/dll/mainwnd.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H.Levine
+  Copyright (c) 2001, 2005 Steven H. Levine
 
   11 Jun 02 SHL Drop obsolete xor code
@@ -14 +14 @@
   23 May 05 SHL Use QWL_USER
   23 May 05 SHL Use datamin.h
+  25 May 05 SHL Use ULONGLONG and CommaFmtULL
 
 ***********************************************************************/
@@ -21 +22 @@
 #define INCL_WINHELP
 #define INCL_GPI
-
+#define INCL_LONGLONG
 #include <os2.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -102 +104 @@
 
         FSALLOCATE fsa;
-        CHAR s[90], szQty[38], *pszUM;
+        CHAR s[90], szQty[38];
         ULONG ulPctFree;
-        float fltFreeQty;
+        ULONGLONG ullFreeQty;
 
         if (!DosQueryFSInfo((d - 'A') + 1,
@@ -111 +113 @@
                             sizeof(FSALLOCATE)))
         {
-          fltFreeQty = (float) fsa.cUnitAvail *
+          ullFreeQty = (ULONGLONG)fsa.cUnitAvail *
             (fsa.cSectorUnit * fsa.cbSector);
-          if (fltFreeQty >= (1024 * 1024))
-          {
-            fltFreeQty /= (1024 * 1024);
-            pszUM = "mb";
-          }
-          else if (fltFreeQty >= 1024)
-          {
-            fltFreeQty /= 1024;
-            pszUM = "kb";
-          }
-          else
-            pszUM = "b";
           ulPctFree = (fsa.cUnit && fsa.cUnitAvail) ?
             (fsa.cUnitAvail * 100) / fsa.cUnit : 0;
-          commafmt(szQty,
-                   sizeof(szQty),
-                   (ULONG) fltFreeQty);
+          CommaFmtULL(szQty,
+                      sizeof(szQty),
+                      ullFreeQty,' ');
           sprintf(s,
-                  "%s%s (%lu%%) free",
+                  "%s (%lu%%) free",
                   szQty,
-                  pszUM,
                   ulPctFree);
         }