xnu-792.10.96.tar.gz

[apple/xnu.git] / bsd / hfs / hfscommon / Catalog / FileIDsServices.c

diff --git a/bsd/hfs/hfscommon/Catalog/FileIDsServices.c b/bsd/hfs/hfscommon/Catalog/FileIDsServices.c
index 44e5996a0ac604b43a27f814ff73be24fcec148b..812f3e58c76d933bcd83fdfdcc5435ddb9a46cb4 100644 (file)
--- a/bsd/hfs/hfscommon/Catalog/FileIDsServices.c
+++ b/bsd/hfs/hfscommon/Catalog/FileIDsServices.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -35,12 +35,12 @@ struct ExtentsRecBuffer {
 typedef struct ExtentsRecBuffer ExtentsRecBuffer;
 
 
 typedef struct ExtentsRecBuffer ExtentsRecBuffer;
 
 

-UInt32 CheckExtents( void *extents, UInt32 blocks, Boolean isHFSPlus );
-OSErr  DeleteExtents( ExtendedVCB *vcb, UInt32 fileNumber, Boolean isHFSPlus );
-OSErr  MoveExtents( ExtendedVCB *vcb, UInt32 srcFileID, UInt32 destFileID, Boolean isHFSPlus );
-void   CopyCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest );
-void   CopyBigCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest );
-void   CopyExtentInfo( ExtentKey *key, ExtentRecord *data, ExtentsRecBuffer *buffer, UInt16 bufferCount );
+static UInt32 CheckExtents( void *extents, UInt32 blocks, Boolean isHFSPlus );
+static OSErr  DeleteExtents( ExtendedVCB *vcb, UInt32 fileNumber, Boolean isHFSPlus );
+static OSErr  MoveExtents( ExtendedVCB *vcb, UInt32 srcFileID, UInt32 destFileID, Boolean isHFSPlus );
+static void  CopyCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest );
+static void  CopyBigCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest );
+static void  CopyExtentInfo( ExtentKey *key, ExtentRecord *data, ExtentsRecBuffer *buffer, UInt16 bufferCount );

 
 
 
 
 
 


@@ -56,18 +56,12 @@ OSErr ExchangeFileIDs( ExtendedVCB *vcb, ConstUTF8Param srcName, ConstUTF8Param
        OSErr           err;
        Boolean         isHFSPlus = ( vcb->vcbSigWord == kHFSPlusSigWord );
 
        OSErr           err;
        Boolean         isHFSPlus = ( vcb->vcbSigWord == kHFSPlusSigWord );
 

-       TrashCatalogIterator(vcb, srcID);       //      invalidate any iterators for this parentID
-       TrashCatalogIterator(vcb, destID);      //      invalidate any iterators for this parentID
-

        err = BuildCatalogKeyUTF8(vcb, srcID, srcName, kUndefinedStrLen, &srcKey, NULL);
        ReturnIfError(err);
 
        err = BuildCatalogKeyUTF8(vcb, destID, destName, kUndefinedStrLen, &destKey, NULL);
        ReturnIfError(err);
 
        err = BuildCatalogKeyUTF8(vcb, srcID, srcName, kUndefinedStrLen, &srcKey, NULL);
        ReturnIfError(err);
 
        err = BuildCatalogKeyUTF8(vcb, destID, destName, kUndefinedStrLen, &destKey, NULL);
        ReturnIfError(err);
 

-       err = BTCheckFreeSpace(GetFileControlBlock(vcb->extentsRefNum));
-       ReturnIfError(err);
-       

        if ( isHFSPlus )
        {
                //--    Step 1: Check the catalog nodes for extents
        if ( isHFSPlus )
        {
                //--    Step 1: Check the catalog nodes for extents


@@ -354,7 +348,7 @@ FlushAndReturn:
 }
 
 
 }
 
 

-void   CopyCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest )
+static void  CopyCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest )

 {
        dest->hfsFile.dataLogicalSize   = src->hfsFile.dataLogicalSize;
        dest->hfsFile.dataPhysicalSize = src->hfsFile.dataPhysicalSize;
 {
        dest->hfsFile.dataLogicalSize   = src->hfsFile.dataLogicalSize;
        dest->hfsFile.dataPhysicalSize = src->hfsFile.dataPhysicalSize;


@@ -365,7 +359,7 @@ void        CopyCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest )
        BlockMoveData( src->hfsFile.rsrcExtents, dest->hfsFile.rsrcExtents, sizeof(HFSExtentRecord) );
 }
 
        BlockMoveData( src->hfsFile.rsrcExtents, dest->hfsFile.rsrcExtents, sizeof(HFSExtentRecord) );
 }
 

-void   CopyBigCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest )
+static void  CopyBigCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest )

 {
        BlockMoveData( &src->hfsPlusFile.dataFork, &dest->hfsPlusFile.dataFork, sizeof(HFSPlusForkData) );
        BlockMoveData( &src->hfsPlusFile.resourceFork, &dest->hfsPlusFile.resourceFork, sizeof(HFSPlusForkData) );
 {
        BlockMoveData( &src->hfsPlusFile.dataFork, &dest->hfsPlusFile.dataFork, sizeof(HFSPlusForkData) );
        BlockMoveData( &src->hfsPlusFile.resourceFork, &dest->hfsPlusFile.resourceFork, sizeof(HFSPlusForkData) );


@@ -373,7 +367,7 @@ void        CopyBigCatalogNodeInfo( CatalogRecord *src, CatalogRecord *dest )
 }
 
 
 }
 
 

-OSErr  MoveExtents( ExtendedVCB *vcb, UInt32 srcFileID, UInt32 destFileID, Boolean isHFSPlus )
+static OSErr  MoveExtents( ExtendedVCB *vcb, UInt32 srcFileID, UInt32 destFileID, Boolean isHFSPlus )

 {
        FCB *                           fcb;
        ExtentsRecBuffer        extentsBuffer[kNumExtentsToCache];
 {
        FCB *                           fcb;
        ExtentsRecBuffer        extentsBuffer[kNumExtentsToCache];


@@ -531,7 +525,7 @@ OSErr       MoveExtents( ExtendedVCB *vcb, UInt32 srcFileID, UInt32 destFileID, Boolea
 }
 
 
 }
 
 

-void   CopyExtentInfo( ExtentKey *key, ExtentRecord *data, ExtentsRecBuffer *buffer, UInt16 bufferCount )
+static void  CopyExtentInfo( ExtentKey *key, ExtentRecord *data, ExtentsRecBuffer *buffer, UInt16 bufferCount )

 {
        BlockMoveData( key, &(buffer[bufferCount].extentKey), sizeof( ExtentKey ) );
        BlockMoveData( data, &(buffer[bufferCount].extentData), sizeof( ExtentRecord ) );
 {
        BlockMoveData( key, &(buffer[bufferCount].extentKey), sizeof( ExtentKey ) );
        BlockMoveData( data, &(buffer[bufferCount].extentData), sizeof( ExtentRecord ) );


@@ -539,7 +533,7 @@ void        CopyExtentInfo( ExtentKey *key, ExtentRecord *data, ExtentsRecBuffer *buffe
 
 
 //--   Delete all extents in extent file that have the ID given.
 
 
 //--   Delete all extents in extent file that have the ID given.

-OSErr  DeleteExtents( ExtendedVCB *vcb, UInt32 fileID, Boolean isHFSPlus )
+static OSErr  DeleteExtents( ExtendedVCB *vcb, UInt32 fileID, Boolean isHFSPlus )

 {
        FCB *                           fcb;
        ExtentKey *                     extentKeyPtr;
 {
        FCB *                           fcb;
        ExtentKey *                     extentKeyPtr;


@@ -617,7 +611,7 @@ OSErr       DeleteExtents( ExtendedVCB *vcb, UInt32 fileID, Boolean isHFSPlus )
 
 
 //     Check if there are extents represented in the extents overflow file.
 
 
 //     Check if there are extents represented in the extents overflow file.

-UInt32 CheckExtents( void *extents, UInt32 totalBlocks, Boolean isHFSPlus )
+static UInt32  CheckExtents( void *extents, UInt32 totalBlocks, Boolean isHFSPlus )

 {
        UInt32          extentAllocationBlocks;
        UInt16          i;
 {
        UInt32          extentAllocationBlocks;
        UInt16          i;