Changeset 533

Timestamp:

Aug 5, 2003, 1:58:41 PM (22 years ago)

Author:

bird

Message:

Initalize library structures to zero. Forget about ext. dict. for now.

File:

• trunk/src/emx/src/emxomf/weakld.c (modified) (6 diffs, 1 prop)

trunk/src/emx/src/emxomf/weakld.c

@@ -595 +595 @@
 static int          libLoadDict(PWLDLIB pLib)
 {
+#if 0
     FILE *phFile;
-
     /* been here, done that? */
     if (pLib->pDict)
@@ -624 +624 @@
     pLib->pDict = NULL;
     return -1;
+#else
+    /* till we support processing the dictionary, we pretend there is none. */
+    pLib->pDict = NULL;
+    return -1;
+#endif 
 }
 
@@ -1344 +1349 @@
  *
  * We'll simply return existing symbol when:
- *      1. adding a UNDEF where a PUBLIC or COMM or !WEAK UNDEF exists.
+ *      1. adding a UNDEF where a PUBLIC, COMM, !WEAK UNDEF or IMPORT exists.
  *      2. adding a WKEXT where a PUBLIC or COMM exists.
  *      3. adding a WKEXT where a UNDEF which isn't UNCERTAIN exists.
  *      4. adding a COMM where a !WEAK COMM exists.
  *      5. adding a WEAK PUBLIC or WEAK COMM where a PUBLIC or COMM exists.
+ *      6. adding a WEAK UNDEF where WEAK UNDEF exists.
  *
  * We'll warn and return existing symbol when:
@@ -1452 +1458 @@
          *      4. adding a COMM where a !WEAK COMM exists.
          *      5. adding a WEAK PUBLIC or WEAK COMM where a PUBLIC or COMM exists.
+         *      6. adding a WEAK UNDEF where WEAK UNDEF exists.
          */
         if ( (     /* 1 */
@@ -1469 +1476 @@
                 ((fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == (WLDSF_PUBLIC | WLDSF_WEAK) || (fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == (WLDSF_COMM | WLDSF_WEAK))
              && ((pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC || (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_COMM)
+            ) || ( /* 6 */
+                ((fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == (WLDSF_UNDEF | WLDSF_WEAK))
+             && ((pSym->fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == (WLDSF_UNDEF | WLDSF_WEAK))
             ))
         {
@@ -2628 +2638 @@
     /* add it to the link, do nothing till we're asked to do the searching. */
     pLib = xmalloc(sizeof(*pLib));
+    memset(pLib, 0, sizeof(*pLib));
     pLib->phFile = phFile;
     pLib->pszLibName = strpool_add(pWld->pStrMisc, pszName);