Changeset 907 for trunk/dll/makelist.c

Timestamp:

Jan 6, 2008, 8:26:17 AM (18 years ago)

Author:

Steven Levine

Message:

Avoid out of memory traps in Compare Directories
Rework Compare Directories progress display for 2 second update rate
Start refactoring to reduce dependence on fm3dll.h
Add timer services (IsITimerExpired etc.)

File:

• trunk/dll/makelist.c (modified) (14 diffs)

trunk/dll/makelist.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2007 Steven H.Levine
+  Copyright (c) 2003, 2008 Steven H.Levine
 
   12 Feb 03 SHL AddToFileList: standardize EA math
@@ -17 +17 @@
 ***********************************************************************/
 
+#include <stdlib.h>
+#include <string.h>
+
 #define INCL_DOS
 #define INCL_WIN
 #define INCL_LONGLONG
-#include <os2.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "fm3dll.h"
+
 #include "fm3str.h"
+#include "makelist.h"
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
+#include "dircnrs.h"
+#include "fm3dll.h"                     // 05 Jan 08 SHL fixme to be gone
 
 static PSZ pszSrcFile = __FILE__;
 
-VOID SortList(LISTINFO * li)
+VOID SortList(LISTINFO *li)
 {
   /* bubble-sort entries by size, descending */
 
-  INT x;
+  UINT x;
   CHAR *s;
   ULONG l;
@@ -64 +65 @@
 }
 
-VOID FreeListInfo(LISTINFO * li)
+VOID FreeListInfo(LISTINFO *li)
 {
   if (li) {
@@ -77 +78 @@
 }
 
-VOID FreeList(CHAR ** list)
-{
-  register INT x;
+VOID FreeList(CHAR **list)
+{
+  UINT x;
 
   if (list) {
@@ -96 +97 @@
 }
 
-INT AddToFileList(CHAR * string, FILEFINDBUF4L * ffb4, FILELIST *** list,
-                  INT * numfiles, INT * numalloced)
+INT AddToFileList(CHAR *string, FILEFINDBUF4L *ffb4, FILELIST ***list,
+                  UINT *pnumfiles, UINT *pnumalloced)
 {
   FILELIST *pfl;
@@ -103 +104 @@
   if (string && ffb4) {
     // Ensure room for NULL entry
-    if (((*numfiles) + 3) > *numalloced) {
+    if (((*pnumfiles) + 3) > *pnumalloced) {
       FILELIST **pflArray;
 
       // Use plain realloc for speed
       // 06 Aug 07 SHL fixme to know why + 6
-      pflArray = realloc(*list, (*numalloced + 6) * sizeof(FILELIST *));
+      pflArray = realloc(*list, (*pnumalloced + 6) * sizeof(FILELIST *));
       if (!pflArray) {
         Runtime_Error(pszSrcFile, __LINE__, GetPString(IDS_OUTOFMEMORY));
         return 1;
       }
-      (*numalloced) += 6;
+      (*pnumalloced) += 6;
       *list = pflArray;
     }
@@ -132 +133 @@
     pfl->easize = CBLIST_TO_EASIZE(ffb4->cbList);
     strcpy(pfl->fname, string);
-    (*list)[*numfiles] = pfl;
-    (*numfiles)++;
+    (*list)[*pnumfiles] = pfl;
+    (*pnumfiles)++;
     // Ensure list always ends with two NULL entries
     // 06 Aug 07 SHL fixme to know why
-    (*list)[*numfiles] = NULL;
-    (*list)[(*numfiles) + 1] = NULL;
+    (*list)[*pnumfiles] = NULL;
+    (*list)[(*pnumfiles) + 1] = NULL;
 #ifdef __DEBUG_ALLOC__
     _heap_check();
@@ -151 +152 @@
  */
 
-INT AddToList(CHAR * string, CHAR *** list, INT * numfiles, INT * numalloced)
+INT AddToList(CHAR *string, CHAR ***list, UINT *pnumfiles, UINT *pnumalloced)
 {
   CHAR **ppsz;
@@ -157 +158 @@
 
   if (string) {
-    if (((*numfiles) + 3) > *numalloced) {
+    if (((*pnumfiles) + 3) > *pnumalloced) {
       // Use plain realloc for speed
-      ppsz = realloc(*list, (*numalloced + 6) * sizeof(CHAR *));
+      ppsz = realloc(*list, (*pnumalloced + 6) * sizeof(CHAR *));
       if (!ppsz) {
         Runtime_Error(pszSrcFile, __LINE__, "realloc");
         return 1;
       }
-      (*numalloced) += 6;
+      (*pnumalloced) += 6;
       *list = ppsz;
     }
@@ -173 +174 @@
       return 2;
     }
-    (*list)[*numfiles] = psz;
-    strcpy((*list)[*numfiles], string); // Add entry
-    (*numfiles)++;
-    (*list)[*numfiles] = NULL;          // Add end marker
-    (*list)[(*numfiles) + 1] = NULL;    // Add 2nd end marker - fixme to know why?
+    (*list)[*pnumfiles] = psz;
+    strcpy((*list)[*pnumfiles], string);        // Add entry
+    (*pnumfiles)++;
+    (*list)[*pnumfiles] = NULL;         // Add end marker
+    (*list)[(*pnumfiles) + 1] = NULL;   // Add 2nd end marker - fixme to know why?
 #ifdef __DEBUG_ALLOC__
     _heap_check();
@@ -189 +190 @@
   PCNRITEM pci;
   CHAR **list = NULL, **test;
-  INT numfiles = 0, numalloc = 0, error = 0, attribute = CRA_CURSORED;
+  UINT numfiles = 0, numalloc = 0;
+  INT error = 0, attribute = CRA_CURSORED;
 
   pci = (PCNRITEM) CurrentRecord(hwndCnr);
@@ -220 +222 @@
   PARCITEM pai;
   CHAR **list = NULL;
-  INT numfiles = 0, numalloc = 0, error = 0, attribute = CRA_CURSORED;
+  UINT numfiles = 0, numalloc = 0;
+  INT error = 0, attribute = CRA_CURSORED;
 
   pai = (PARCITEM) CurrentRecord(hwndCnr);
@@ -239 +242 @@
 }
 
-CHAR **RemoveFromList(CHAR ** list, CHAR * item)
-{
-  register INT x, y;
+CHAR **RemoveFromList(CHAR **list, CHAR *item)
+{
+  UINT x, y;
 
   if (list && list[0] && item) {
@@ -264 +267 @@
 }
 
-CHAR **CombineLists(CHAR ** prime, CHAR ** add)
-{
-  register INT x;
-  INT numalloc, numfiles = 0;
+CHAR **CombineLists(CHAR **prime, CHAR **add)
+{
+  UINT x;
+  UINT numalloc, numfiles = 0;
 
   if (add && add[0]) {