diff options
Diffstat (limited to 'fs/udf/unicode.c')
-rw-r--r-- | fs/udf/unicode.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c index 44b815e57f94..afd470e588ff 100644 --- a/fs/udf/unicode.c +++ b/fs/udf/unicode.c | |||
@@ -412,7 +412,6 @@ static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName, | |||
412 | int extIndex = 0, newExtIndex = 0, hasExt = 0; | 412 | int extIndex = 0, newExtIndex = 0, hasExt = 0; |
413 | unsigned short valueCRC; | 413 | unsigned short valueCRC; |
414 | uint8_t curr; | 414 | uint8_t curr; |
415 | const uint8_t hexChar[] = "0123456789ABCDEF"; | ||
416 | 415 | ||
417 | if (udfName[0] == '.' && | 416 | if (udfName[0] == '.' && |
418 | (udfLen == 1 || (udfLen == 2 && udfName[1] == '.'))) { | 417 | (udfLen == 1 || (udfLen == 2 && udfName[1] == '.'))) { |
@@ -477,10 +476,10 @@ static int udf_translate_to_linux(uint8_t *newName, uint8_t *udfName, | |||
477 | newIndex = 250; | 476 | newIndex = 250; |
478 | newName[newIndex++] = CRC_MARK; | 477 | newName[newIndex++] = CRC_MARK; |
479 | valueCRC = crc_itu_t(0, fidName, fidNameLen); | 478 | valueCRC = crc_itu_t(0, fidName, fidNameLen); |
480 | newName[newIndex++] = hexChar[(valueCRC & 0xf000) >> 12]; | 479 | newName[newIndex++] = hex_asc_upper_hi(valueCRC >> 8); |
481 | newName[newIndex++] = hexChar[(valueCRC & 0x0f00) >> 8]; | 480 | newName[newIndex++] = hex_asc_upper_lo(valueCRC >> 8); |
482 | newName[newIndex++] = hexChar[(valueCRC & 0x00f0) >> 4]; | 481 | newName[newIndex++] = hex_asc_upper_hi(valueCRC); |
483 | newName[newIndex++] = hexChar[(valueCRC & 0x000f)]; | 482 | newName[newIndex++] = hex_asc_upper_lo(valueCRC); |
484 | 483 | ||
485 | if (hasExt) { | 484 | if (hasExt) { |
486 | newName[newIndex++] = EXT_MARK; | 485 | newName[newIndex++] = EXT_MARK; |