Merged the Mac Pro 7 changes onto the trunk of NSPR.
authorwtc%netscape.com
Thu, 14 Mar 2002 23:31:03 +0000
changeset 2297 98fcc63cae1c4ff157f07337cbc9102c4b4621ca
parent 2293 ec0447ad0b35c3f643fa8e64f4a22fa3b7a5c4b2
child 2298 2294214f75d9085f3fe53cbc303885c2b833730f
push idunknown
push userunknown
push dateunknown
Merged the Mac Pro 7 changes onto the trunk of NSPR.
pr/src/md/mac/macdll.c
--- a/pr/src/md/mac/macdll.c
+++ b/pr/src/md/mac/macdll.c
@@ -213,17 +213,17 @@ GetSharedLibraryFilterProc(const CInfoPB
 		
 				break;
 			default:
 				return;
 		}
 	
 		// see if this symbol is in this fragment
 		if (LibInPefContainer(&fragSpec, pFilterData->inName, &codeOffset, &codeLength))
-			tempErr = GetDiskFragment(&fragSpec, codeOffset, codeLength, pFilterData->inName, kLoadCFrag, &pFilterData->outID, &pFilterData->outAddress, errName);
+			tempErr = GetDiskFragment(&fragSpec, codeOffset, codeLength, fragSpec.name, kLoadCFrag, &pFilterData->outID, &pFilterData->outAddress, errName);
 		else
 			return;
 				
 		// stop if we found a library by that name
 		if (noErr == tempErr)
 		{			
 			*inWantQuit = true;
 			pFilterData->outFound = true;
@@ -507,17 +507,17 @@ OSErr NSLoadNamedFragment(const FSSpec *
 	Ptr				main;
 	Str255		fragName = "\p";
 	Str255		errName;
 	OSErr			err;
 	
 	err = GetNamedFragmentOffsets(fileSpec, fragmentName, &fragOffset, &fragLength);
 	if (err != noErr) return err;
 				
-	err = GetDiskFragment(fileSpec, fragOffset, fragLength, fragName, 
+	err = GetDiskFragment(fileSpec, fragOffset, fragLength, fileSpec->name, 
 					kLoadCFrag, outConnectionID, &main, errName);
 
 	return err;
 }
 
 
 /*-----------------------------------------------------------------
 
@@ -550,17 +550,17 @@ OSErr NSLoadIndexedFragment(const FSSpec
 	{
 		UInt32 nameLen = strlen(fragNameBlock);
 		if (nameLen > 63)
 			nameLen = 63;
 		BlockMoveData(fragNameBlock, &fragName[1], nameLen);
 		fragName[0] = nameLen;
 	}
 
-	err = GetDiskFragment(fileSpec, fragOffset, fragLength, fragName, 
+	err = GetDiskFragment(fileSpec, fragOffset, fragLength, fileSpec->name, 
 					kLoadCFrag, outConnectionID, &main, errName);
 	if (err != noErr)
 	{
 		free(fragNameBlock);
 		return err;
 	}
 
 	*outFragName = fragNameBlock;