xnu-2782.40.9.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_encodings.h

diff --git a/bsd/hfs/hfs_encodings.h b/bsd/hfs/hfs_encodings.h
index 6b3e1e3ce94bb8d5b8d0dfd1c1a1c3e074ef1a79..f93ed4666fd4c5481e339b30d7505b77e55d33c5 100644 (file)
--- a/bsd/hfs/hfs_encodings.h
+++ b/bsd/hfs/hfs_encodings.h
@@ -1,23 +1,29 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1997-2000 Apple Computer, Inc. All Rights Reserved
  */
 /*
  * Copyright (c) 1997-2000 Apple Computer, Inc. All Rights Reserved


@@ -49,17 +55,16 @@
  */
 
 typedef int (* hfs_to_unicode_func_t)(const Str31 hfs_str, UniChar *uni_str,
  */
 
 typedef int (* hfs_to_unicode_func_t)(const Str31 hfs_str, UniChar *uni_str,

-               UInt32 maxCharLen, UInt32 *usedCharLen);
+               u_int32_t maxCharLen, u_int32_t *usedCharLen);

 
 

-typedef int (* unicode_to_hfs_func_t)(UniChar *uni_str, UInt32 unicodeChars,
+typedef int (* unicode_to_hfs_func_t)(UniChar *uni_str, u_int32_t unicodeChars,

                Str31 hfs_str);
 
                Str31 hfs_str);
 

-
-int hfs_addconverter(int kmod_id, UInt32 encoding,
+int hfs_addconverter(int kmod_id, u_int32_t encoding,

                hfs_to_unicode_func_t get_unicode,
                unicode_to_hfs_func_t get_hfsname);
 
                hfs_to_unicode_func_t get_unicode,
                unicode_to_hfs_func_t get_hfsname);
 

-int hfs_remconverter(int kmod_id, UInt32 encoding);
+int hfs_remconverter(int kmod_id, u_int32_t encoding);

 
 #endif /* __APPLE_API_UNSTABLE */
 
 
 #endif /* __APPLE_API_UNSTABLE */