Changeset 2893 for trunk/kLdr/kLdrDyldMod.c

Timestamp:

Dec 22, 2006, 7:01:38 PM (19 years ago)

Author:

bird

Message:

made it compile again.

File:

• trunk/kLdr/kLdrDyldMod.c (modified) (5 diffs)

trunk/kLdr/kLdrDyldMod.c

@@ -932 +932 @@
  * pvUser points to the KLDRDYLDMOD.
  */
-static int kldrDyldModFixupGetImportCallback(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol, const char *pszSymbol,
+static int kldrDyldModFixupGetImportCallback(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol,
+                                             const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
                                              PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
 {
@@ -958 +959 @@
 
         rc = kLdrModQuerySymbol(pPrereqMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                                iSymbol, pszSymbol, kldrDyldModFixupGetImportCallback, pPrereqMod, puValue, pfKind);
+                                iSymbol, pchSymbol, cchSymbol, pszVersion,
+                                kldrDyldModFixupGetImportCallback, pPrereqMod, puValue, pfKind);
         if (rc)
         {
-            if (pszSymbol)
-                kldrDyldFailure(rc, "%s[%d]->%s.%s", pDyldMod->pMod->pszName, iImport,
-                                pPrereqMod->pMod->pszName, pszSymbol);
+            if (pchSymbol)
+                kldrDyldFailure(rc, "%s[%d]->%s.%.*s%s", pDyldMod->pMod->pszName, iImport,
+                                pPrereqMod->pMod->pszName, cchSymbol, pchSymbol, pszVersion ? pszVersion : "");
             else
-                kldrDyldFailure(rc, "%s[%d]->%s.%d", pDyldMod->pMod->pszName, iImport,
-                                pPrereqMod->pMod->pszName, iSymbol);
+                kldrDyldFailure(rc, "%s[%d]->%s.%d%s", pDyldMod->pMod->pszName, iImport,
+                                pPrereqMod->pMod->pszName, iSymbol, pszVersion ? pszVersion : "");
         }
     }
@@ -980 +982 @@
             KLDRADDR uValue;
             rc = kLdrModQuerySymbol(pBindMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                                    iSymbol, pszSymbol, kldrDyldModFixupGetImportCallback, pBindMod, &uValue, &fKind);
+                                    iSymbol, pchSymbol, cchSymbol, pszVersion,
+                                    kldrDyldModFixupGetImportCallback, pBindMod, &uValue, &fKind);
             if (    !rc
                 &&  (   !fFound
@@ -1000 +1003 @@
         if (!fFound)
         {
-            if (pszSymbol)
-                kldrDyldFailure(rc, "%s->%s", pDyldMod->pMod->pszName, pszSymbol);
+            if (pchSymbol)
+                kldrDyldFailure(rc, "%s->%.*s%s", pDyldMod->pMod->pszName, cchSymbol, pchSymbol, pszVersion ? pszVersion : "");
             else
-                kldrDyldFailure(rc, "%s->%d", pDyldMod->pMod->pszName, iSymbol);
+                kldrDyldFailure(rc, "%s->%d%s", pDyldMod->pMod->pszName, iSymbol, pszVersion ? pszVersion : "");
         }
     }
@@ -1277 +1280 @@
 
     rc = kLdrModQuerySymbol(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                            uSymbolOrdinal, pszSymbolName, kldrDyldModFixupGetImportCallback, pMod,
+                            uSymbolOrdinal, pszSymbolName, kLdrHlpStrLen(pszSymbolName), NULL,
+                            kldrDyldModFixupGetImportCallback, pMod,
                             &uValue, &fKind);
     if (!rc)