Changeset 342 for trunk/dll/avl.c

Timestamp:

Jul 26, 2006, 4:00:11 AM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/avl.c (modified) (28 diffs)

trunk/dll/avl.c

@@ -21 +21 @@
   16 Jun 06 SHL load_archivers: support signatures containing 0s
   26 Jun 06 SHL load_archivers: remember where comments are
+  14 Jul 06 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -38 +39 @@
 #include "fm3dlg.h"
 #include "fm3str.h"
+
+static PSZ pszSrcFile = __FILE__;
 
 #pragma alloc_text(MISC9,quick_find_type,find_type)
@@ -407 +410 @@
       // At start of defintion
 
-      pat = malloc(sizeof(ARC_TYPE));
+      pat = xmallocz(sizeof(ARC_TYPE),pszSrcFile,__LINE__);
       if (!pat)
-        break;                          // fixme to complain
-
-      memset(pat, 0, sizeof(ARC_TYPE));
-      pat -> id = strdup(sz);
+        break;
+      pat -> id = xstrdup(sz,pszSrcFile,__LINE__);
 
       pat -> comment_line_num = per_sig_comment_line_num;
@@ -420 +421 @@
         break;
       if (*sz)
-        pat -> ext = strdup(sz);
+        pat -> ext = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> ext = NULL;
@@ -429 +430 @@
         break;
       if (*sz)
-        pat -> list = strdup(sz);
+        pat -> list = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> list = NULL;
@@ -437 +438 @@
         break;
       if (*sz)
-        pat -> extract = strdup(sz);
+        pat -> extract = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> extract = NULL;
@@ -443 +444 @@
         break;
       if (*sz)
-        pat -> exwdirs = strdup(sz);
+        pat -> exwdirs = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> exwdirs = NULL;
@@ -449 +450 @@
         break;
       if (*sz)
-        pat -> test = strdup(sz);
+        pat -> test = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> test = NULL;
@@ -455 +456 @@
         break;
       if (*sz)
-        pat -> create = strdup(sz);
+        pat -> create = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> create = NULL;
@@ -461 +462 @@
         break;
       if (*sz)
-        pat -> createwdirs = strdup(sz);
+        pat -> createwdirs = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> createwdirs = NULL;
@@ -467 +468 @@
         break;
       if (*sz)
-        pat -> createrecurse = strdup(sz);
+        pat -> createrecurse = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> createrecurse = NULL;
@@ -473 +474 @@
         break;
       if (*sz)
-        pat -> move = strdup(sz);
+        pat -> move = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> move = NULL;
@@ -479 +480 @@
         break;
       if (*sz)
-        pat -> movewdirs = strdup(sz);
+        pat -> movewdirs = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> movewdirs = NULL;
@@ -485 +486 @@
         break;
       if (*sz)
-        pat -> delete = strdup(sz);
+        pat -> delete = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> delete = NULL;
@@ -494 +495 @@
       {
         pat -> siglen = i;
-        pat -> signature = malloc(i);
+        pat -> signature = xmalloc(i,pszSrcFile,__LINE__);
         if (!pat -> signature)
           break;
@@ -506 +507 @@
         break;
       if (*sz)
-        pat -> startlist = strdup(sz);
+        pat -> startlist = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> startlist = NULL;
@@ -512 +513 @@
         break;
       if (*sz)
-        pat -> endlist = strdup(sz);
+        pat -> endlist = xstrdup(sz,pszSrcFile,__LINE__);
       else
         pat -> endlist = NULL;
@@ -590 +591 @@
 }
 
-#define TEST_DRAG 0                     // fixme to gone
+#define TEST_DRAG 0                     // fixme to be gone or to work
 
 #pragma alloc_text(FMARCHIVE,SBoxDlgProc,SDlgListboxSubclassProc)
@@ -654 +655 @@
                              VK_ENDDRAG,
                              NULL);
-          if (!hwndDrop) {
-            Win_Error(hwnd,hwnd,__FILE__,__LINE__,"DrgDrag");
-          }
+          if (!hwndDrop)
+            Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,"DrgDrag");
 
           DrgFreeDraginfo(pdinfo);
@@ -723 +723 @@
       pditem = DrgQueryDragitemPtr(pdinfo,0);
       if (!pditem)
-        Win_Error(hwnd,hwnd,__FILE__,__LINE__,"DM_DROP");
+        Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,"DM_DROP");
       /* Check valid rendering mechanisms and data */
       ok = DrgVerifyRMF(pditem,DRM_LBOX,NULL) && ~pditem->fsControl & DC_PREPARE;
@@ -765 +765 @@
     if (!(ARC_TYPE **)mp2)
     {
-      DosBeep(100, 100);
+      Runtime_Error(pszSrcFile, __LINE__, "no data");
       WinDismissDlg(hwnd, 0);
       break;
@@ -804 +804 @@
       if (sSelect == LIT_NONE)
       {
-        DosBeep(100, 100);
+        Runtime_Error(pszSrcFile, __LINE__, "list empty");
         return 0;
       }
@@ -838 +838 @@
       else
       {
+        Runtime_Error(pszSrcFile, __LINE__, "no match");
         // Refuse to select
         WinSendDlgItemMsg(hwnd, ASEL_LISTBOX, LM_SELECTITEM,
                           MPFROMSHORT(LIT_NONE), FALSE);
-        DosBeep(100, 100);
         return 0;
       }
@@ -880 +880 @@
         ARCDUMP ad;
         memset(&ad,0,sizeof(ARCDUMP));
-        ad.info = malloc(sizeof(ARC_TYPE));
+        ad.info = xmallocz(sizeof(ARC_TYPE),pszSrcFile,__LINE__);
         if (ad.info) {
-          memset(ad.info, 0, sizeof(ARC_TYPE));
           if (!WinDlgBox(HWND_DESKTOP,
                          hwnd,
@@ -899 +898 @@
             if (!pat) {
               if (arcsighead)
-                saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u", sSelect, __FILE__, __LINE__);
+                saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u", sSelect, pszSrcFile, __LINE__);
               else
                 arcsighead = ad.info;
@@ -939 +938 @@
 
         if (!pat) {
-          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, __FILE__, __LINE__);
+          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, pszSrcFile, __LINE__);
         }
         else {
@@ -980 +979 @@
           ; // Find self
         if (!pat || !pat->prev) {
-          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, __FILE__, __LINE__);
+          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d at %s::%u",sSelect, pszSrcFile, __LINE__);
         }
         else {
@@ -1027 +1026 @@
           ; // Find self
         if (!pat || !pat->next) {
-          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d/%d at %s::%u",sSelect, sItemCount, __FILE__, __LINE__);
+          saymsg(0,NULLHANDLE,"*Debug*","Can not find self at %d/%d at %s::%u",sSelect, sItemCount, pszSrcFile, __LINE__);
         }
         else {