xnu-344.21.74.tar.gz

[apple/xnu.git] / bsd / hfs / hfscommon / Unicode / UnicodeWrappers.c

diff --git a/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c b/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
index 90c08d466ac411ea912321f45fd655fa7b9c20b6..efd8b8a4cc27a3376eee0c872a9e998f3e23b7bd 100644 (file)
--- a/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
+++ b/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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_LICENSE_HEADER_END@
  */


@@ -148,9 +151,6 @@ CountFilenameExtensionChars( const unsigned char * filename, UInt32 length )
        UInt16  maxExtChars;
        Boolean foundExtension;
 
        UInt16  maxExtChars;
        Boolean foundExtension;
 

-       if (length == kUndefinedStrLen)
-               length = strlen(filename);
-

        if ( length < 3 )
                return 0;       /* "x.y" is smallest possible extension */
        
        if ( length < 3 )
                return 0;       /* "x.y" is smallest possible extension */
        


@@ -199,9 +199,6 @@ GetEmbeddedFileID(const unsigned char * filename, UInt32 length, UInt32 *prefixL
        if ( filename == NULL )
                return 0;
 
        if ( filename == NULL )
                return 0;
 

-       if (length == kUndefinedStrLen)
-               length = strlen(filename);
-

        if ( length < 28 )
                return 0;       /* too small to have been mangled */
 
        if ( length < 28 )
                return 0;       /* too small to have been mangled */
 


@@ -274,8 +271,6 @@ HexStringToInteger(UInt32 length, const UInt8 *hexStr)
  *             return   0 if equal
  *
  */
  *             return   0 if equal
  *
  */

-extern unsigned short gCompareTable[];
-

 SInt32 FastRelString( ConstStr255Param str1, ConstStr255Param str2 )
 {
        UInt16*                 compareTable;
 SInt32 FastRelString( ConstStr255Param str1, ConstStr255Param str2 )
 {
        UInt16*                 compareTable;


@@ -390,9 +385,6 @@ SInt32      FastRelString( ConstStr255Param str1, ConstStr255Param str2 )
 //                     return 1;
 //
 
 //                     return 1;
 //
 

-extern UInt16 gLowerCaseTable[];
-extern UInt16 gLatinCaseFold[];
-

 SInt32 FastUnicodeCompare ( register ConstUniCharArrayPtr str1, register ItemCount length1,
                                                        register ConstUniCharArrayPtr str2, register ItemCount length2)
 {
 SInt32 FastUnicodeCompare ( register ConstUniCharArrayPtr str1, register ItemCount length1,
                                                        register ConstUniCharArrayPtr str2, register ItemCount length2)
 {