Changeset 329 for trunk/dll/tools.c

Timestamp:

Jul 25, 2006, 8:39:11 PM (19 years ago)

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/tools.c (modified) (11 diffs)

trunk/dll/tools.c

@@ -4 +4 @@
   $Id$
 
-  Toolbar support routines for FM/2
+  Toolbar support routines
 
   Copyright (c) 1994-97 M. Kimes
-  Copyright (c) 2004, 2005 Steven H.Levine
+  Copyright (c) 2004, 2006 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
   23 May 05 SHL Use QWL_USER
+  22 Jul 06 SHL Check more run time errors
 
 ***********************************************************************/
@@ -16 +17 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <share.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -28 +30 @@
 
 #pragma data_seg(DATA1)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(TOOLS,load_tools,save_tools,add_tool,insert_tool,del_tool,free_tools,swap_tools,load_quicktools,save_quicktools)
 #pragma alloc_text(TOOLS1,ReOrderToolsProc,PickToolProc,AddToolProc,ToolIODlgProc)
@@ -56 +61 @@
   strcat(s,"QUICKTLS.DAT");
   fp = _fsopen(s,"r",SH_DENYWR);
-  if(fp) {
+  if (fp) {
     while(x < 50 && !feof(fp)) {
       if(!fgets(s,CCHMAXPATH + 2,fp))
@@ -63 +68 @@
       bstripcr(s);
       if(*s && *s != ';') {
-        quicktool[x] = strdup(s);
+        quicktool[x] = xstrdup(s,pszSrcFile,__LINE__);
         if(quicktool[x])
           x++;
@@ -85 +90 @@
     strcat(s,"\\");
   strcat(s,"QUICKTLS.DAT");
-  fp = fopen(s,"w");
-  if(fp) {
+  fp = xfopen(s,"w",pszSrcFile,__LINE__);
+  if (fp) {
     for(x = 0;quicktool[x] && x < 50;x++)
       fprintf(fp,"%s\n",quicktool[x]);
@@ -117 +122 @@
     strcpy(lasttoolbox,filename);
     fp = _fsopen(filename,"r",SH_DENYWR);
-    if(fp) {
+    if (fp) {
       toolhead = free_tools();
       while(!feof(fp)) {
@@ -134 +139 @@
         if(!(USHORT)atoi(idstr))
           continue;
-        info = malloc(sizeof(TOOL));
-        if(info) {
-          memset(info,0,sizeof(TOOL));
+        info = xmallocz(sizeof(TOOL),pszSrcFile,__LINE__);
+        if (info) {
           if(*help) {
             literal(help);
             if(*help)
-              info->help = strdup(help);
+              info->help = xstrdup(help,pszSrcFile,__LINE__);
           }
           if(*text)
-            info->text = strdup(text);
+            info->text = xstrdup(text,pszSrcFile,__LINE__);
           info->flags = (atoi(flagstr) & (~(T_TEXT | T_EMPHASIZED)));
           info->id = (USHORT)atoi(idstr);
@@ -193 +197 @@
     return;
   }
-  fp = fopen(filename,"w");
-  if(fp) {
+  fp = xfopen(filename,"w",pszSrcFile,__LINE__);
+  if (fp) {
     fprintf(fp,GetPString(IDS_TOOLFILETEXT),filename);
     info = toolhead;
@@ -777 +781 @@
               tool->text = NULL;
               if(*help)
-                tool->help = strdup(help);
+                tool->help = xstrdup(help,pszSrcFile,__LINE__);
               if(*text)
-                tool->text = strdup(text);
+                tool->text = xstrdup(text,pszSrcFile,__LINE__);
               tool->flags = (((dropable) ? T_DROPABLE : 0)  |
                             ((invisible) ? T_INVISIBLE : 0) |
@@ -811 +815 @@
               tool = tool->next;
             }
-            tool = malloc(sizeof(TOOL));
-            if(tool) {
-              memset(tool,0,sizeof(TOOL));
+            tool = xmallocz(sizeof(TOOL),pszSrcFile,__LINE__);
+            if (tool) {
               if(*help)
-                tool->help = strdup(help);
+                tool->help = xstrdup(help,pszSrcFile,__LINE__);
               if(*text)
-                tool->text = strdup(text);
+                tool->text = xstrdup(text,pszSrcFile,__LINE__);
               tool->id = (USHORT)atoi(idstr);
               tool->flags = (((dropable) ? T_DROPABLE : 0)  |