xnu-1504.9.17.tar.gz

[apple/xnu.git] / bsd / hfs / hfscommon / headers / CatalogPrivate.h

diff --git a/bsd/hfs/hfscommon/headers/CatalogPrivate.h b/bsd/hfs/hfscommon/headers/CatalogPrivate.h
index 3c0c3363ba0b765c165ea8e58fa35c2879d703da..bd3f00ddd6cc70f2c100fdf222b49e3a9e820ce2 100644 (file)
--- a/bsd/hfs/hfscommon/headers/CatalogPrivate.h
+++ b/bsd/hfs/hfscommon/headers/CatalogPrivate.h
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -90,18 +90,15 @@
 //
 
 
 //
 
 

-extern OSErr   LocateCatalogNode(      const ExtendedVCB *volume, HFSCatalogNodeID folderID, const CatalogName *name,
-                                                                       UInt32 hint, CatalogKey *key, CatalogRecord *data, UInt32 *newHint);
-
-extern OSErr   LocateCatalogNodeByKey ( const ExtendedVCB *volume, UInt32 hint, CatalogKey *keyPtr,
-                                                                                CatalogRecord *dataPtr, UInt32 *newHint );
+extern OSErr   LocateCatalogNodeByKey ( const ExtendedVCB *volume, u_int32_t hint, CatalogKey *keyPtr,
+                                                                                CatalogRecord *dataPtr, u_int32_t *newHint );

 
 extern OSErr   LocateCatalogRecord( const ExtendedVCB *volume, HFSCatalogNodeID folderID, const CatalogName *name,
 
 extern OSErr   LocateCatalogRecord( const ExtendedVCB *volume, HFSCatalogNodeID folderID, const CatalogName *name,

-                                                                        UInt32 hint, CatalogKey *keyPtr, CatalogRecord *dataPtr, UInt32 *newHint);
+                                                                        u_int32_t hint, CatalogKey *keyPtr, CatalogRecord *dataPtr, u_int32_t *newHint);

 
 extern OSErr   LocateCatalogNodeWithRetry ( const ExtendedVCB *volume, HFSCatalogNodeID folderID, ConstStr31Param pascalName,
 
 extern OSErr   LocateCatalogNodeWithRetry ( const ExtendedVCB *volume, HFSCatalogNodeID folderID, ConstStr31Param pascalName,

-                                                                                        CatalogName *unicodeName, UInt32 hint, CatalogKey *keyPtr, CatalogRecord *dataPtr,
-                                                                                        UInt32 *newHint );
+                                                                                        CatalogName *unicodeName, u_int32_t hint, CatalogKey *keyPtr, CatalogRecord *dataPtr,
+                                                                                        u_int32_t *newHint );

 extern OSErr   FlushCatalog( ExtendedVCB *volume);
 
 
 extern OSErr   FlushCatalog( ExtendedVCB *volume);
 
 


@@ -111,8 +108,8 @@ extern void         ConvertInputNameToUnicode(ConstStr31Param name, TextEncoding encodi
 extern void    BuildCatalogKey( HFSCatalogNodeID parentID, const CatalogName *name, Boolean isHFSPlus,
                                                                 CatalogKey *key);
 
 extern void    BuildCatalogKey( HFSCatalogNodeID parentID, const CatalogName *name, Boolean isHFSPlus,
                                                                 CatalogKey *key);
 

-extern OSErr   BuildCatalogKeyUTF8(ExtendedVCB *volume, HFSCatalogNodeID parentID, const char *name,
-                                   UInt32 length, CatalogKey *key, UInt32 *textEncoding);
+extern OSErr   BuildCatalogKeyUTF8(ExtendedVCB *volume, HFSCatalogNodeID parentID, const unsigned char *name,
+                                   u_int32_t length, CatalogKey *key, u_int32_t *textEncoding);

 
 extern void            CopyCatalogName( const CatalogName *srcName, CatalogName *dstName, Boolean isHFSPLus);
 
 
 extern void            CopyCatalogName( const CatalogName *srcName, CatalogName *dstName, Boolean isHFSPLus);