xnu-792.1.5.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 1e02d093237531e02b2b6afaf560113b01e70f02..91b3e7a984ed811b23b4cbce19e1c1f8df3503a1 100644 (file)
--- a/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
+++ b/bsd/hfs/hfscommon/Unicode/UnicodeWrappers.c
@@ -1,5 +1,5 @@
 /*
 /*

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

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


@@ -51,36 +51,10 @@ enum {
 
 static void    GetFilenameExtension( ItemCount length, ConstUniCharArrayPtr unicodeStr, char* extStr );
 
 
 static void    GetFilenameExtension( ItemCount length, ConstUniCharArrayPtr unicodeStr, char* extStr );
 

-static void    GetFileIDString( HFSCatalogNodeID fileID, char* fileIDStr );

 
 static UInt32  HexStringToInteger( UInt32 length, const UInt8 *hexStr );
 
 
 
 static UInt32  HexStringToInteger( UInt32 length, const UInt8 *hexStr );
 
 

-
-/*
- * Convert file ID into a hexidecimal string with no leading zeros
- */
-static void
-GetFileIDString( HFSCatalogNodeID fileID, char * fileIDStr )
-{
-       SInt32  i, b;
-       UInt8   *translate = (UInt8 *) "0123456789ABCDEF";
-       UInt8   c;
-       
-       fileIDStr[0] = '#';
-
-       for ( i = 0, b = 28; b >= 0; b -= 4 ) {
-               c = *(translate + ((fileID >> b) & 0x0000000F));
-               
-               /* if its not a leading zero add it to our string */
-               if ( (c != (UInt8) '0') || (i > 1) || (b == 0) )
-                       fileIDStr[++i] = c;
-       }
-
-       fileIDStr[++i] = '\0';
-}
-
-

 /*
  * Get filename extension (if any) as a C string
  */
 /*
  * Get filename extension (if any) as a C string
  */


@@ -235,7 +209,7 @@ static UInt32
 HexStringToInteger(UInt32 length, const UInt8 *hexStr)
 {
        UInt32          value;
 HexStringToInteger(UInt32 length, const UInt8 *hexStr)
 {
        UInt32          value;

-       short           i;
+       UInt32          i;

        UInt8           c;
        const UInt8     *p;
 
        UInt8           c;
        const UInt8     *p;
 


@@ -448,7 +422,7 @@ ConvertUnicodeToUTF8Mangled(ByteCount srcLen, ConstUniCharArrayPtr srcStr, ByteC
        char fileIDStr[15];
        char extStr[15];
 
        char fileIDStr[15];
        char extStr[15];
 

-       GetFileIDString(cnid, fileIDStr);
+       sprintf(fileIDStr, "#%X", cnid);

        GetFilenameExtension(srcLen/sizeof(UniChar), srcStr, extStr);
 
        /* remove extension chars from source */
        GetFilenameExtension(srcLen/sizeof(UniChar), srcStr, extStr);
 
        /* remove extension chars from source */