Changeset 440 for trunk/dll/tools.c

Timestamp:

Aug 24, 2006, 6:46:25 AM (19 years ago)

Author:

root

Message:

Report more runtime errors

File:

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

trunk/dll/tools.c

@@ -13 +13 @@
   22 Jul 06 SHL Check more run time errors
   29 Jul 06 SHL Use xfgets, xfgets_bstripcr
+  18 Aug 06 SHL Report more runtime errors
 
 ***********************************************************************/
@@ -40 +41 @@
 
 
-VOID load_quicktools (VOID) {
-
+//== load_quicktools() build *.tls array ==
+
+VOID load_quicktools(VOID)
+{
   FILE      *fp;
   CHAR       s[CCHMAXPATH + 14];
-  INT        x = 0;
+  INT        x;
 
   qtloaded = TRUE;
-  while(x < 50 && quicktool[x]) {
+  for (x = 0; x < 50 && quicktool[x]; x++) {
     free(quicktool[x]);
     quicktool[x] = NULL;
-    x++;
-  }
-  if(!fToolbar) {
+  }
+  if (!fToolbar) {
     qtloaded = FALSE;
     return;
   }
-  x = 0;
   save_dir2(s);
-  if(s[strlen(s) - 1] != '\\')
+  if (s[strlen(s) - 1] != '\\')
     strcat(s,"\\");
   strcat(s,"QUICKTLS.DAT");
   fp = _fsopen(s,"r",SH_DENYWR);
   if (fp) {
-    while(x < 50 && !feof(fp)) {
-      if(!xfgets_bstripcr(s,CCHMAXPATH + 2,fp,pszSrcFile,__LINE__))
+    x = 0;
+    while (!feof(fp)) {
+      if (!xfgets_bstripcr(s,CCHMAXPATH + 2,fp,pszSrcFile,__LINE__))
         break;
-      if(*s && *s != ';') {
-        quicktool[x] = xstrdup(s,pszSrcFile,__LINE__);
-        if(quicktool[x])
-          x++;
-      }
+      if (!*s || *s == ';')
+        continue;
+      if (x >= 50) {
+        Runtime_Error(pszSrcFile, __LINE__, "add");
+        break;
+      }
+      quicktool[x] = xstrdup(s,pszSrcFile,__LINE__);
+      if (!quicktool[x])
+        break;
+      x++;
     }
     fclose(fp);
@@ -77 +84 @@
 
 
-VOID save_quicktools (VOID) {
-
+VOID save_quicktools(VOID)
+{
   FILE *fp;
   INT   x = 0;
@@ -98 +105 @@
 
 
-TOOL *load_tools (CHAR *filename) {
-
+//== load_tools() Build tools list given .tls filename ==
+
+TOOL *load_tools(CHAR *filename)
+{
   FILE  *fp;
   CHAR   help[80],text[80],flagstr[80],idstr[80],*fname;
@@ -161 +170 @@
 
 
-VOID save_tools (CHAR *filename) {
-
+VOID save_tools(CHAR *filename)
+{
   FILE  *fp;
   CHAR  *fname;
@@ -220 +229 @@
 
 
-TOOL *add_tool (TOOL *tool) {
-
+TOOL *add_tool(TOOL *tool)
+{
   TOOL *info;
 
@@ -240 +249 @@
 
 
-TOOL *insert_tool (TOOL *tool,TOOL *after) {
-
+TOOL *insert_tool(TOOL *tool,TOOL *after)
+{
   if(tool) {
     if(!toolhead)
@@ -260 +269 @@
 
 
-TOOL *del_tool (TOOL *tool) {
-
+TOOL *del_tool(TOOL *tool)
+{
   TOOL *info,*prev = NULL;
 
@@ -288 +297 @@
 
 
-TOOL *find_tool (USHORT id) {
-
+TOOL *find_tool(USHORT id)
+{
   TOOL *tool;
 
@@ -304 +313 @@
 
 
-TOOL *next_tool (TOOL *tool,BOOL skipinvisible) {
-
+TOOL *next_tool(TOOL *tool,BOOL skipinvisible)
+{
   while(tool) {
     if(tool->next && (skipinvisible && (tool->next->flags & T_INVISIBLE)))
@@ -316 +325 @@
 
 
-TOOL *prev_tool (TOOL *tool,BOOL skipinvisible) {
-
+TOOL *prev_tool(TOOL *tool,BOOL skipinvisible)
+{
   TOOL *info;
 
@@ -341 +350 @@
 
 
-TOOL *swap_tools (TOOL *tool1,TOOL *tool2) {
-
+TOOL *swap_tools(TOOL *tool1,TOOL *tool2)
+{
   TOOL *prev1 = NULL,*prev2 = NULL,*info;
 
@@ -370 +379 @@
 
 
-TOOL *free_tools (VOID) {
-
+TOOL *free_tools(VOID)
+{
   TOOL *tool,*next;
 
@@ -389 +398 @@
 
 
-MRESULT EXPENTRY ReOrderToolsProc (HWND hwnd,ULONG msg,MPARAM mp1,
-                                   MPARAM mp2) {
-
+MRESULT EXPENTRY ReOrderToolsProc(HWND hwnd,ULONG msg,MPARAM mp1,
+                                  MPARAM mp2)
+{
   switch(msg) {
     case WM_INITDLG:
@@ -602 +611 @@
 
 
-MRESULT EXPENTRY AddToolProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY AddToolProc(HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_INITDLG:
@@ -621 +630 @@
         WinCheckButton(hwnd,ADDBTN_VISIBLE,TRUE);
       else {
-
         TOOL *tool = (TOOL *)mp2;
         CHAR  s[33];
@@ -881 +889 @@
 
 
-MRESULT EXPENTRY PickToolProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY PickToolProc(HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_INITDLG:
       if(mp2) {
-
         CHAR s[133];
 
@@ -954 +961 @@
 
 
-MRESULT EXPENTRY ToolIODlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY ToolIODlgProc(HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_INITDLG:
@@ -1034 +1041 @@
     case WM_CONTROL:
       if(SHORT1FROMMP(mp1) == SVBTN_LISTBOX) {
-
         SHORT sSelect;
         CHAR  szBuffer[CCHMAXPATH];