Changeset 156 for trunk/dll/treecnr.c

Timestamp:

May 26, 2005, 4:18:35 AM (20 years ago)

Author:

root

Message:

Rename comnam to szCommonName and fix typo
Use ULONGLONG and CommaFmtULL

File:

• trunk/dll/treecnr.c (modified) (10 diffs)

trunk/dll/treecnr.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2003 Steven H.Levine
-
-  Revisions     16 Oct 02 SHL - Handle large partitions
-                11 Jun 03 SHL - Add JFS and FAT32 support
+  Copyright (c) 2001, 2005 Steven H. Levine
+
+  16 Oct 02 SHL Handle large partitions
+  11 Jun 03 SHL Add JFS and FAT32 support
+  25 May 05 SHL Rename comnam to szCommonName and fix typo
+  25 May 05 SHL Use ULONGLONG and CommaFmtULL
 
 ***********************************************************************/
@@ -18 +20 @@
 #define INCL_GPI
 #define INCL_DOSERRORS
-
+#define INCL_LONGLONG
 #include <os2.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -25 +28 @@
 #include <string.h>
 #include <ctype.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -551 +555 @@
 
 
-MRESULT EXPENTRY TreeObjWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY TreeObjWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   DIRCNRDATA *dcd;
 
@@ -678 +682 @@
           CHAR  volumelabel[CCHMAXPATH];
         }          volser;
-        CHAR       fbytes[81];
+        CHAR       szBuf[81];
         CNRINFO    cnri;
 
@@ -709 +713 @@
                                    &fsa,
                                    sizeof(FSALLOCATE))) {
-                  strcpy(fbytes,"  ");
-                  commafmt(fbytes + 2,sizeof(fbytes) - 4,
-                           (ULONG)(((float)fsa.cUnitAvail *
-                             (fsa.cSectorUnit * fsa.cbSector)) / 1024L));
-                  strcat(fbytes,
+                  strcpy(szBuf,"  ");
+                  CommaFmtULL(szBuf + 2,sizeof(szBuf) - 4,
+                              (ULONGLONG)fsa.cUnitAvail * (fsa.cSectorUnit * fsa.cbSector),
+                              'K');
+                  strcat(szBuf,
                          GetPString(IDS_KFREETEXT));
                 }
                 else
-                  *fbytes = 0;
+                  *szBuf = 0;
                 driveserial[toupper(*pci->szFileName) - 'A'] = volser.serial;
                 sprintf(&s[strlen(s)],
@@ -723 +727 @@
                         toupper(*pci->szFileName),
                         volser.volumelabel,
-                        volser.serial,fbytes);
+                        volser.serial,szBuf);
                 if(!fMoreButtons) {
                   if(*dcd->mask.szMask ||
@@ -985 +989 @@
           case '\n':
             dcd->lasttime = 0;
-            *dcd->comnam = 0;
+            *dcd->szCommonName = 0;
             break;
           default:
             thistime = WinQueryMsgTime(WinQueryAnchorBlock(hwnd));
             if(thistime > dcd->lasttime + 1250)
-              *dcd->comnam = 0;
+              *dcd->szCommonName = 0;
             dcd->lasttime = thistime;
-            if(SHORT1FROMMP(mp2) == ' ' && !dcd->comnam)
+            if(SHORT1FROMMP(mp2) == ' ' && !*dcd->szCommonName)
               break;
 KbdRetry:
-            len = strlen(dcd->comnam);
+            len = strlen(dcd->szCommonName);
             if(len >= CCHMAXPATH - 1) {
-              *dcd->comnam = 0;
+              *dcd->szCommonName = 0;
               len = 0;
             }
-            dcd->comnam[len] = toupper(SHORT1FROMMP(mp2));
-            dcd->comnam[len + 1] = 0;
+            dcd->szCommonName[len] = toupper(SHORT1FROMMP(mp2));
+            dcd->szCommonName[len + 1] = 0;
             memset(&srch,0,sizeof(SEARCHSTRING));
             srch.cb = (ULONG)sizeof(SEARCHSTRING);
-            srch.pszSearch = (PSZ)dcd->comnam;
+            srch.pszSearch = (PSZ)dcd->szCommonName;
             srch.fsPrefix = TRUE;
             srch.fsCaseSensitive = FALSE;
@@ -1025 +1029 @@
             else {
               if(SHORT1FROMMP(mp2) == ' ') {
-                dcd->comnam[len] = 0;
+                dcd->szCommonName[len] = 0;
                 break;
               }
-              *dcd->comnam = 0;
+              *dcd->szCommonName = 0;
               dcd->lasttime = 0;
               if(len)           // retry as first letter if no match
@@ -1073 +1077 @@
                                 (PVOID)&amem,
                                 (ULONG)sizeof(amem))) {
-              commafmt(tpm,sizeof(tpm),amem / 1024L);
-              strcat(tpm,"k");
-            }
-            if(!Dos16MemAvail(&amem)) {
-              commafmt(tm,sizeof(tm),amem / 1024L);
-              strcat(tm,"k");
-            }
-            commafmt(tb,sizeof(tb),ffb.cbFile / 1024L);
+              CommaFmtULL(tpm,sizeof(tpm),amem,'K');
+            }
+            if(!Dos16MemAvail(&amem))
+              CommaFmtULL(tm,sizeof(tm),amem,'K');
+            CommaFmtULL(tb,sizeof(tb),ffb.cbFile,'K');
             sprintf(s," %s %sk%s%s%s%s",
                     GetPString(IDS_SWAPFILETEXT),