xnu-201.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 4e7a2d0f90d0650133b7d6e063fe55d569571021..43cdd2a22333fe7a6ea0ede3cabb4982c71e8a8a 100644 (file)
--- a/bsd/hfs/hfscommon/Catalog/FileIDsServices.c
+++ b/bsd/hfs/hfscommon/Catalog/FileIDsServices.c
@@ -158,17 +158,16 @@ OSErr ExchangeFileIDs( ExtendedVCB *vcb, ConstUTF8Param srcName, ConstUTF8Param
        CatalogRecord   swapData;       // 520 bytes
        SInt16                  numSrcExtentBlocks;
        SInt16                  numDestExtentBlocks;
        CatalogRecord   swapData;       // 520 bytes
        SInt16                  numSrcExtentBlocks;
        SInt16                  numDestExtentBlocks;

-       UInt32                  textEncoding;

        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
 
        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, &textEncoding);
+       err = BuildCatalogKeyUTF8(vcb, srcID, srcName, kUndefinedStrLen, &srcKey, NULL);

        ReturnIfError(err);
 
        ReturnIfError(err);
 

-       err = BuildCatalogKeyUTF8(vcb, destID, destName, kUndefinedStrLen, &destKey, &textEncoding);
+       err = BuildCatalogKeyUTF8(vcb, destID, destName, kUndefinedStrLen, &destKey, NULL);

        ReturnIfError(err);
 
        if ( isHFSPlus )
        ReturnIfError(err);
 
        if ( isHFSPlus )