Changeset 162 for trunk/dll/datamin.c

Timestamp:

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

Author:

root

Message:

Use ULONGLONG and CommaFmtULL

File:

• trunk/dll/datamin.c (modified) (13 diffs)

trunk/dll/datamin.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H.Levine
+  Copyright (c) 2001, 2005 Steven H. Levine
 
   14 Sep 02 SHL Handle large partitions
@@ -13 +13 @@
   23 May 05 SHL Use QWL_USER
   23 May 05 SHL Avoid delays for inaccessible drives
+  25 May 05 SHL Use ULONGLONG and CommaFmtULL
 
 ***********************************************************************/
@@ -20 +21 @@
 #define INCL_WIN
 #define INCL_GPI
-
+#define INCL_LONGLONG
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -724 +726 @@
       CHAR s[90];
       CHAR szFreeQty[38];
-      CHAR *pszFreeUM;
       CHAR szDrvLtr[] = " :";
       CHAR *pszFSystem;
-      float fltFreeQty;
+      ULONGLONG ullFreeQty;
       ULONG ulPercentFree;
       ULONG wasx;
@@ -748 +749 @@
         if (!pDM || pDM -> qfsi_rc)
         {
-          fltFreeQty = 0;
-          pszFreeUM = "";
+          ullFreeQty = 0;
           ulPercentFree = 0;
         }
         else
         {
-          fltFreeQty = (float) pDM -> fsa.cUnitAvail *
+          ullFreeQty = (ULONGLONG)pDM -> fsa.cUnitAvail *
                        (pDM -> fsa.cSectorUnit * pDM -> fsa.cbSector);
-          if (fltFreeQty >= (1024 * 1024))
-          {
-            fltFreeQty /= (1024 * 1024);
-            pszFreeUM = "mb";
-          }
-          else if (fltFreeQty >= 1024)
-          {
-            fltFreeQty /= 1024;
-            pszFreeUM = "kb";
-          }
-          else
-            pszFreeUM = "b";
 
           ulPercentFree = (pDM -> fsa.cUnit && pDM -> fsa.cUnitAvail) ?
@@ -774 +762 @@
         }
 
-        commafmt(szFreeQty, sizeof(szFreeQty), (ULONG)fltFreeQty);
+        CommaFmtULL(szFreeQty, sizeof(szFreeQty), ullFreeQty,' ');
         *szDrvLtr = (CHAR)(id - MINI_DRIVEA) + 'A';
 
@@ -786 +774 @@
         }
         sprintf(s,
-                " %s %s%s (%lu%%) %s [%s]",
+                " %s %s (%lu%%) %s [%s]",
                 szDrvLtr,
                 szFreeQty,
-                pszFreeUM,
                 ulPercentFree,
                 GetPString(IDS_FREETEXT),
@@ -978 +965 @@
       FILEFINDBUF3 ffb;
       ULONG nm = 1L;
-      float fltFreeQty;
+      ULONGLONG ullFreeQty;
       HDIR hdir = HDIR_CREATE;
       FSALLOCATE fsa;
@@ -991 +978 @@
           priority_bumped();
           DosFindClose(hdir);
-          *szFileQty = *szFreeQty = 0;
           DosError(FERR_DISABLEHARDERR);
           if (!DosQueryFSInfo(toupper(*SwapperDat) - '@', FSIL_ALLOC,
                               &fsa, sizeof(FSALLOCATE)))
           {
-            fltFreeQty = fsa.cUnitAvail * (fsa.cSectorUnit * fsa.cbSector);
-            if (fltFreeQty > 1024 * 1024)
-            {
-              pszFreeUM = "mb";
-              fltFreeQty /= (1024 * 1024);
-            }
-            else if (fltFreeQty > 1024)
-            {
-              pszFreeUM = "kb";
-              fltFreeQty /= 1024;
-            }
-            else
-            {
-              pszFreeUM = "b";
-            }
-            commafmt(szFreeQty, sizeof(szFreeQty), (ULONG) fltFreeQty);
-          }
-          if (ffb.cbFile > 1024 * 1024)
-          {
-            pszFileUM = "mb";
-            commafmt(szFileQty, sizeof(szFileQty), ffb.cbFile / (1024 * 1024));
-          }
-          else if (ffb.cbFile > 1024)
-          {
-            pszFileUM = "kb";
-            commafmt(szFileQty, sizeof(szFileQty), ffb.cbFile / 1024);
+            ullFreeQty = (ULONGLONG)fsa.cUnitAvail * (fsa.cSectorUnit * fsa.cbSector);
+            CommaFmtULL(szFreeQty, sizeof(szFreeQty), ullFreeQty,' ');
           }
           else
-          {
-            pszFileUM = "b";
-            commafmt(szFileQty, sizeof(szFileQty), ffb.cbFile);
-          }
-          sprintf(s, " %s %s%s%s%s%s",
+            *szFreeQty = 0;
+
+          CommaFmtULL(szFileQty, sizeof(szFileQty), ffb.cbFile,' ');
+          sprintf(s, " %s %s%s%s",
                   GetPString(IDS_SWAPTITLETEXT),
                   szFileQty,
-                  pszFileUM,
-                  (*szFreeQty) ? "/" : NullStr,
-                  szFreeQty,
-                  (*szFreeQty) ? pszFreeUM : NullStr);
-          WinSetDlgItemText(hwnd,
-                            MINI_SWAP,
-                            s);
+                  *szFreeQty ? "/" : NullStr,
+                  szFreeQty);
+          WinSetDlgItemText(hwnd,MINI_SWAP,s);
         }
       }
@@ -1045 +1002 @@
   case UM_SETUP3:                       // Memory utilization
     {
-      CHAR s[134], tm[38], szQty[38], *pszUM, *tmk;
+      CHAR s[134], tm[38], szQty[38];
       ULONG amem = 0;
 
@@ -1051 +1008 @@
                            (PVOID) & amem, (ULONG) sizeof(amem)))
       {
-        *tm = *szQty = 0;
-        if (amem > 1024 * 1024)
-        {
-          tmk = "mb";
-          commafmt(tm, sizeof(tm), amem / (1024 * 1024));
-        }
-        else if (amem > 1024)
-        {
-          tmk = "kb";
-          commafmt(tm, sizeof(tm), amem / 1024);
-        }
+        CommaFmtUL(tm, sizeof(tm), amem,'M');
+        if (!Dos16MemAvail(&amem))
+          CommaFmtUL(szQty, sizeof(szQty), amem,'M');
         else
-        {
-          tmk = "b";
-          commafmt(tm, sizeof(tm), amem);
-        }
-        if (!Dos16MemAvail(&amem))
-        {
-          if (amem > 1024 * 1024)
-          {
-            pszUM = "mb";
-            commafmt(szQty, sizeof(szQty), amem / (1024 * 1024));
-          }
-          else if (amem > 1024)
-          {
-            pszUM = "kb";
-            commafmt(szQty, sizeof(szQty), amem / 1024);
-          }
-          else
-          {
-            pszUM = "b";
-            commafmt(szQty, sizeof(szQty), amem);
-          }
-        }
-        sprintf(s, " %s%s%s%s%s%s",
+          *szQty = 0;
+        sprintf(s, " %s%s%s%s",
                 GetPString(IDS_MEMTITLETEXT),
                 szQty,
-                (*szQty) ? pszUM : NullStr,
                 (*szQty) ? "/" : NullStr,
-                tm,
-                tmk);
+                tm);
         WinSetDlgItemText(hwnd,
                           MINI_MEM,
@@ -1129 +1055 @@
               ppi = (PPROCESSINFO) (ppi -> ptiFirst + ppi -> usThreadCount);
             }
-            *szQty = *tm = 0;
             commafmt(szQty, sizeof(szQty), numprocs);
             commafmt(tm, sizeof(tm), numthreads);
@@ -1149 +1074 @@
       else
       {
-        *szQty = 0;
         commafmt(szQty, sizeof(szQty),
             WinQuerySwitchList(WinQueryAnchorBlock(hwnd), (PSWBLOCK) 0, 0));