hfs-556.100.11.tar.gz

[apple/hfs.git] / fsck_hfs / dfalib / SRebuildBTree.c

diff --git a/fsck_hfs/dfalib/SRebuildBTree.c b/fsck_hfs/dfalib/SRebuildBTree.c
index 79ef408da072b9ed987f4157e9d06d4dfef29c23..c92ad81531132735cf33d3c6b72610216bfbeffb 100755 (executable)
--- a/fsck_hfs/dfalib/SRebuildBTree.c
+++ b/fsck_hfs/dfalib/SRebuildBTree.c
@@ -27,12 +27,12 @@
        
        Written by:     Jerry Cottingham
 
-       Copyright:      © 1986, 1990, 1992-2002 by Apple Computer, Inc., all rights reserved.
+       Copyright:      � 1986, 1990, 1992-2002 by Apple Computer, Inc., all rights reserved.
 
 */
 
 #define SHOW_ELAPSED_TIMES  0
-#define DEBUG_REBUILD  1
+#define DEBUG_REBUILD  0
 
 extern void MyIndirectLog(const char *);
 
@@ -474,7 +474,7 @@ ExitThisRoutine:
        SFCB *                                  myFCBPtr, * oldFCBPtr;
        UInt32                                  myBytesUsed = 0;
        UInt32                                  myMapNodeCount;
-       UInt64                                  myNumBlocks;
+       UInt32                                  myNumBlocks;
        FSSize                                  myNewEOF;
        BTHeaderRec                             myHeaderRec;
        
@@ -532,7 +532,7 @@ ExitThisRoutine:
        myErr = BlockFindAll( myBTreeCBPtr->fcbPtr, myNumBlocks);
        ReturnIfError( myErr );
        myBTreeCBPtr->fcbPtr->fcbPhysicalSize = myNewEOF;
-       myErr = ZeroFileBlocks( myVCBPtr, myBTreeCBPtr->fcbPtr, 0, myNewEOF >> kSectorShift );
+       myErr = ZeroFileBlocks( myVCBPtr, myBTreeCBPtr->fcbPtr, 0, (UInt32)(myNewEOF >> kSectorShift) );
        ReturnIfError( myErr );
 
        /* now set real values in our BTree Control Block */
@@ -544,7 +544,7 @@ ExitThisRoutine:
        else if (FileID == kHFSExtentsFileID)
                myFCBPtr->fcbClumpSize = myVCBPtr->vcbExtentsFile->fcbClumpSize;
        
-       myBTreeCBPtr->totalNodes = ( myFCBPtr->fcbPhysicalSize / myBTreeCBPtr->nodeSize );
+       myBTreeCBPtr->totalNodes = (UInt32)( myFCBPtr->fcbPhysicalSize / myBTreeCBPtr->nodeSize );
        myBTreeCBPtr->freeNodes = myBTreeCBPtr->totalNodes;
 
        // Initialize our new BTree (write out header node and an empty leaf node)