Changeset 156 for trunk/dll/arccnrs.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/arccnrs.c (modified) (24 diffs)

trunk/dll/arccnrs.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 Ensure archive name not garbage
@@ -13 +13 @@
   01 Aug 04 SHL Rework lstrip/rstrip usage
   23 May 05 SHL Use QWL_USER
+  25 May 05 SHL Rename comnam to szCommonName and fix typo
+  25 May 05 SHL Use ULONGLONG and CommaFmtULL
 
 ***********************************************************************/
@@ -20 +22 @@
 #define INCL_WIN
 #define INCL_GPI
-
+#define INCL_LONGLONG
 #include <os2.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -31 +34 @@
 #include <share.h>
 #include <limits.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -263 +267 @@
 
 
-INT FillArcCnr (HWND hwndCnr,CHAR *arcname,ARC_TYPE **arcinfo,
-                ULONG *totalbytes)
+static INT FillArcCnr (HWND hwndCnr,CHAR *arcname,ARC_TYPE **arcinfo,
+                ULONGLONG *pullTotalBytes)
 {
 
@@ -300 +304 @@
   gotstart = gotend = FALSE;
   lastpai = NULL;
-  *totalbytes = 0L;
+  *pullTotalBytes = 0;
   if(info && info->list) {
     WinSendMsg(hwndCnr,
@@ -555 +559 @@
                             MPFROMP(pai),
                             MPFROMP(&ri)))
-                *totalbytes += pai->cbFile;
+                *pullTotalBytes += pai->cbFile;
               if(!lastpai)
                 lastpai = pai;
@@ -1276 +1280 @@
         dcd->hwndObject = hwnd;         // pass back hwnd
         if(ParentIsDesktop(hwnd,dcd->hwndParent))
-          DosSleep(250L);               // Avoid race?
+          DosSleep(250);                // Avoid race?
       }
       else
@@ -1292 +1296 @@
         WinSetWindowText(dcd->hwndFrame,"AV/2");
         WinSetWindowText(WinWindowFromID(dcd->hwndFrame,FID_TITLEBAR),dcd->arcname);
-        dcd->totalbytes = dcd->totalfiles =
+        dcd->ullTotalBytes = dcd->totalfiles =
           dcd->selectedfiles = dcd->selectedbytes = 0;
         WinSetDlgItemText(dcd->hwndClient,DIR_TOTALS,"0");
@@ -1299 +1303 @@
                                      dcd->arcname,
                                      &dcd->info,
-                                     &dcd->totalbytes);
+                                     &dcd->ullTotalBytes);
         if(!dcd->totalfiles)
           PostMsg(dcd->hwndCnr,
@@ -1862 +1866 @@
                           (li->type == IDM_EDITTEXT && *editor) ||
                           (li->type == IDM_EDITBINARY && *bined)) {
-                    DosSleep(100L);
+                    DosSleep(100);
                     ExecOnList(hwnd,((li->type == IDM_VIEWTEXT) ? viewer :
                                      (li->type == IDM_VIEWBINARY) ? binview :
@@ -2032 +2036 @@
           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 = dcd->szCommonName;
             srch.fsPrefix = TRUE;
             srch.fsCaseSensitive = FALSE;
@@ -2064 +2068 @@
 
               /* make found item current item */
-              if(!stricmp(pci->pszFileName,dcd->comnam))
+              if(!stricmp(pci->pszFileName,dcd->szCommonName))
                 attrib |= CRA_SELECTED;
               WinSendMsg(hwnd,
@@ -2076 +2080 @@
             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
@@ -2185 +2189 @@
 
         CNRINFO  cnri;
-        CHAR     s[CCHMAXPATH * 2],tb[81],tf[81],*tbk;
+        CHAR     s[CCHMAXPATH * 2],tb[81],tf[81];
         PARCITEM pci;
 
@@ -2203 +2207 @@
         dcd->totalfiles = cnri.cRecords;
         commafmt(tf,sizeof(tf),dcd->selectedfiles);
-        *tb = 0;
-        if(dcd->totalbytes) {
-          if(dcd->selectedbytes > 1024) {
-            tbk = "k";
-            commafmt(tb,sizeof(tb),dcd->selectedbytes / 1024L);
-          }
-          else {
-            tbk = "b";
-            commafmt(tb,sizeof(tb),dcd->selectedbytes);
-          }
-        }
-        sprintf(s,"%s%s%s%s",tf,(*tb) ? " / " : NullStr,tb,
-                (*tb) ? tbk : NullStr);
+        if (dcd->ullTotalBytes)
+          CommaFmtULL(tb,sizeof(tb),dcd->selectedbytes,'K');
+        else
+          *tb = 0;
+        sprintf(s,"%s%s%s",
+                tf,
+                *tb ? " / " : NullStr,
+                tb);
         WinSetDlgItemText(dcd->hwndClient,
                           DIR_SELECTED,
                           s);
         commafmt(tf,sizeof(tf),dcd->totalfiles);
-        *tb = 0;
-        if(dcd->totalbytes) {
-          if(dcd->totalbytes > 1024) {
-            tbk = "k";
-            commafmt(tb,sizeof(tb),dcd->totalbytes / 1024L);
-          }
-          else {
-            tbk = "b";
-            commafmt(tb,sizeof(tb),dcd->totalbytes);
-          }
-        }
-        sprintf(s,"%s%s%s%s",tf,(*tb) ? " / " : NullStr,tb,
-                (*tb) ? tbk : NullStr);
+        if (dcd->ullTotalBytes)
+          CommaFmtULL(tb,sizeof(tb),dcd->ullTotalBytes,'K');
+        else
+          *tb = 0;
+        sprintf(s,"%s%s%s",
+                tf,
+                *tb ? " / " : NullStr,
+                tb);
         WinSetDlgItemText(dcd->hwndClient,
                           DIR_TOTALS,
                           s);
         if(hwndStatus &&
-           dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
-          sprintf(s," [%s%s%s%s]%s%s%s  %s",tf,(*tb) ? " / " : NullStr,
-                  tb,(*tb) ? tbk : NullStr,
+           dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent))
+        {
+          sprintf(s," [%s%s%s]%s%s%s  %s",
+                  tf,
+                  *tb ? " / " : NullStr,
+                  tb,
                   (*dcd->mask.szMask) ? " (" : NullStr,
                   (*dcd->mask.szMask) ? dcd->mask.szMask : NullStr,
@@ -2251 +2248 @@
             if(pci && (INT)pci != -1) {
               if(fSplitStatus && hwndStatus2) {
-                *tb = 0;
-                if(dcd->totalbytes)
-                  commafmt(tb,sizeof(tb),pci->cbFile);
-                sprintf(s,"%s%s%s%s",(*tb) ? " " : NullStr,tb,
-                        (*tb) ? "b  " : NullStr,
+                if (dcd->ullTotalBytes)
+                  CommaFmtULL(tb,sizeof(tb),pci->cbFile,' ');
+                else
+                  *tb = 0;
+                sprintf(s,"%s%s%s%s",
+                        *tb ? " " : NullStr,
+                        tb,
+                        *tb ? "  " : NullStr,
                         pci->szFileName);
                 WinSetWindowText(hwndStatus2,s);
@@ -2292 +2292 @@
             ULONG  z,was;
 
-            rc = DosCreateDir(dcd->workdir,0L);
+            rc = DosCreateDir(dcd->workdir,0);
             if(rc) {
               if(rc == ERROR_ACCESS_DENIED) {
@@ -2303 +2303 @@
                     was++;
                     sprintf(p,"%03x");
-                    rc = DosCreateDir(dcd->workdir,0L);
+                    rc = DosCreateDir(dcd->workdir,0);
                     if(!rc || rc != ERROR_ACCESS_DENIED)
                       break;
@@ -2756 +2756 @@
 
           case IDM_RESCAN:
-            dcd->totalbytes = dcd->totalfiles =
+            dcd->ullTotalBytes = dcd->totalfiles =
               dcd->selectedfiles = dcd->selectedbytes = 0;
             WinSetDlgItemText(dcd->hwndClient,DIR_TOTALS,"0");
@@ -2763 +2763 @@
                                          dcd->arcname,
                                          &dcd->info,
-                                         &dcd->totalbytes);
+                                         &dcd->ullTotalBytes);
             PostMsg(dcd->hwndCnr,
                     UM_RESCAN,
@@ -3346 +3346 @@
               PNOTIFYRECORDEMPHASIS pre = mp2;
               PARCITEM              pci;
-              CHAR                  s[CCHMAXPATHCOMP + 91],tf[81],tb[81],*tbk;
+              CHAR                  s[CCHMAXPATHCOMP + 91],tf[81],tb[81];
 
               pci = (PARCITEM)((pre) ? pre->pRecord : NULL);
@@ -3368 +3368 @@
                 }
                 commafmt(tf,sizeof(tf),dcd->selectedfiles);
-                *tb = 0;
-                if(dcd->totalbytes) {
-                  if(dcd->selectedbytes > 1024) {
-                    tbk = "k";
-                    commafmt(tb,sizeof(tb),dcd->selectedbytes / 1024L);
-                  }
-                  else {
-                    tbk = "b";
-                    commafmt(tb,sizeof(tb),dcd->selectedbytes);
-                  }
-                }
-                sprintf(s,"%s%s%s%s",tf,(*tb) ? " / " : NullStr,tb,
-                        (*tb) ? tbk : NullStr);
+                if (dcd->ullTotalBytes)
+                  CommaFmtULL(tb,sizeof(tb),dcd->selectedbytes,' ');
+                else
+                  *tb = 0;
+                sprintf(s,"%s%s%s",
+                        tf,
+                        *tb ? " / " : NullStr,
+                        tb);
                 WinSetDlgItemText(dcd->hwndClient,DIR_SELECTED,s);
               }
@@ -3389 +3384 @@
                   if(pci->rc.flRecordAttr & CRA_CURSORED) {
                     if(fSplitStatus && hwndStatus2) {
-                      *tb = 0;
-                      if(dcd->totalbytes)
-                        commafmt(tb,sizeof(tb),pci->cbFile);
-                      sprintf(s,"%s%s%s%s",(*tb) ? " " : NullStr,tb,
-                              (*tb) ? "b  " : NullStr,
+                      if (dcd->ullTotalBytes)
+                        CommaFmtULL(tb,sizeof(tb),pci->cbFile,' ');
+                      else
+                        *tb = 0;
+                      sprintf(s,"%s%s%s%s",
+                              *tb ? " " : NullStr,
+                              tb,
+                              *tb ? "  " : NullStr,
                               pci->szFileName);
                       WinSetWindowText(hwndStatus2,s);