Changeset 1205

Timestamp:

Feb 8, 2004, 4:53:22 AM (22 years ago)

Author:

bird

Message:

Diagnostics.

File:

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

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

@@ -443 +443 @@
 static inline unsigned symHash(const char* pszSym, unsigned cch);
 static const char * symGetDescr(PWLDSYM pSym);
+static void         symDumpReferers(PWLDSYM pSym);
 static void         symDbg(PWLDSYM pSym, const char *pszMsg);
 static PWLDSYM      symAdd(PWLD pWld, PWLDMOD pMod, unsigned fFlags, const char *pachName, int cchName, PWLDSYMACTION peAction);
@@ -1356 +1357 @@
     else
         wldErr(pWld, "Unresolved symbol (%s) '%s'.", symGetDescr(pSym), pSym->pszName);
-    if (pSym->cReferers)
-    {
-        int     i;
-        wldInfo("The symbol is referenced by:\n");
-        for (i = 0; i < pSym->cReferers; i++)
-        {
-            pMod = pSym->paReferers[i];
-            if (pMod->pLib)
-                fprintf(stderr, "    %s(%s)\n", pMod->pLib->pszLibName, pMod->pszModName);
-            else
-                fprintf(stderr, "    %s\n", pMod->pszModName);
-        }
-    }
+    symDumpReferers(pSym);
     return 0;
 }
@@ -1461 +1450 @@
 }
 
+
+/**
+ * Dumps the list of modules referencing a symbol.
+ *
+ * @param   pSym    Symbol in question.
+ */
+static void symDumpReferers(PWLDSYM pSym)
+{
+    if (pSym->cReferers)
+    {
+        int i;
+        wldInfo("The symbol is referenced by:\n");
+        for (i = 0; i < pSym->cReferers; i++)
+        {
+            PWLDMOD pMod = pSym->paReferers[i];
+            if (pMod->pLib)
+                fprintf(stderr, "    %s(%s)\n", pMod->pLib->pszLibName, pMod->pszModName);
+            else
+                fprintf(stderr, "    %s\n", pMod->pszModName);
+        }
+    }
+}
 
 
@@ -1709 +1720 @@
             modErr(pMod, "Duplicate symbol '%s' ('%s').", pszName, pSym->pszName);
             if (pSym->pMod)
-                modErr(pSym->pMod, "Previous symbol defined in this module.");
-            wldInfo("fFlags new 0x%04x  fFlags old 0x%04x.", fFlags, pSym->fFlags);
+                modErr(pSym->pMod, "Symbol previosly defined in this module.");
+            wldInfo("fFlags new 0x%04x  fFlags old 0x%04x (%s).", fFlags, pSym->fFlags, symGetDescr(pSym));
+            symDumpReferers(pSym);
             pSym = NULL;
         }
-
-        /*
-         * Maintain the module pointer and referers.
-         */
-        if (pSym)
-        {
-            if (SYM_IS_DEFINED(pSym->fFlags))
-                pSym->pMod = pMod;
-            else
+    }
+
+    /*
+     * Maintain the module pointer and referers.
+     */
+    if (pSym)
+    {
+        if (SYM_IS_DEFINED(pSym->fFlags))
+            pSym->pMod = pMod;
+        else
+        {
+            int i;
+            for (i = 0; i < pSym->cReferers; i++)
+                if (pSym->paReferers[i] == pMod)
+                    break;
+            if (i >= pSym->cReferers)
             {
-                int i;
-                for (i = 0; i < pSym->cReferers; i++)
-                    if (pSym->paReferers[i] == pMod)
-                        break;
-                if (i >= pSym->cReferers)
-                {
-                    if (!(pSym->cReferers % 64))
-                        pSym->paReferers = xrealloc(pSym->paReferers, sizeof(pSym->paReferers[0]) * (pSym->cReferers + 64));
-                    pSym->paReferers[pSym->cReferers++] = pMod;
-                }
+                if (!(pSym->cReferers % 64))
+                    pSym->paReferers = xrealloc(pSym->paReferers, sizeof(pSym->paReferers[0]) * (pSym->cReferers + 64));
+                pSym->paReferers[pSym->cReferers++] = pMod;
             }
         }