Changeset 279

Timestamp:

Dec 8, 2005, 8:43:33 AM (20 years ago)

Author:

root

Message:

Comments

File:

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

trunk/dll/avl.c

@@ -13 +13 @@
   13 Aug 05 SHL find_type: correct no sig exists bypass logic
   13 Aug 05 SHL SBoxDlgProc: avoid dereferencing NULL signature
+  18 Aug 05 SHL Comments
 
 ***********************************************************************/
@@ -131 +132 @@
     } // for
     DosClose(handle);                   /* Either way, we're done for now */
-    return info;                        /* return signature, if any */
+    return info;                        /* Return signature, if any */
 }
 
@@ -139 +140 @@
 {
     FILE *handle;
-    CHAR s[257], *p;
-    ARC_TYPE *info = NULL, *last = NULL;
-    INT numlines = NUMLINES, x;
+    CHAR s[257];
+    CHAR *p;
+    ARC_TYPE *info = NULL;
+    ARC_TYPE *last = NULL;
+    INT numlines = NUMLINES;
+    INT x;
 
     loadedarcs = TRUE;
@@ -156 +160 @@
         return -2;
     strcpy(archiverbb2, p);
+    // Get lines per record count
     if (!fgets(s, 256, handle))
     {
@@ -163 +168 @@
     p = strchr(s, ';');
     if (p)
-        *p = 0;
+        *p = 0;                         // Chop trailing comment
     bstripcr(s);
     if (*s)
@@ -169 +174 @@
     if (!*s || numlines < NUMLINES)
         return -3;
+    // Parse rest
     while (!feof(handle))
     {
         if (!fgets(s, 256, handle))
-            break;
+            break;                      // EOF
         p = strchr(s, ';');
         if (p)
             *p = 0;                     // Chop comment
-
         bstripcr(s);
+        // 1st non-blank line starts definition
+        // fixme to preserve comments
+        // fixme to avoid allocating empty fields
         if (*s)
         {
             info = malloc(sizeof(ARC_TYPE));
             if (!info)
-                break;
+                break;                  // fixme to complain
             memset(info, 0, sizeof(ARC_TYPE));
             if (*s)
@@ -381 +389 @@
                 }
             }
+            // Ignore unknown lines - must be newer file format
             for (x = NUMLINES; x < numlines; x++)
             {
@@ -386 +395 @@
                     break;
             }
+
             info -> next = NULL;
+
             if (!arcsighead)
             {
@@ -398 +409 @@
                 last = info;
             }
-            if (info -> extract &&
-                    !*info -> extract)
+            if (info -> extract && !*info -> extract)
             {
                 free(info -> extract);
                 info -> extract = NULL;
             }
-        }
+        } // if got definition
         info = NULL;
     }
@@ -410 +420 @@
     if (info)
     {
+        // fixme to complain about partial definition
         if (info -> id)
             free(info -> id);
@@ -491 +502 @@
                         if (test -> signature && temp -> signature &&
                             !strcmp(test -> signature, temp -> signature))
-                            goto ContinueHere;          // Got match
+                            goto ContinueHere;  // Got match
                         test = test -> next;
                     }