mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 12:59:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

vt: fix comment vs definition mismatch

Browse Source 
Fixes for:

  ucs_is_zero_width()
  ucs_is_double_width()
  ucs_recompose()

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202504111036.YH1iEqBR-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202504111359.urXWyzvQ-lkp@intel.com/
Link: https://lore.kernel.org/r/o4974349-pp4p-4374-80q9-2oppqqr94r60@syhkavp.arg
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nicolas Pitre
2025-04-11 13:43:58 -04:00
committed by Greg Kroah-Hartman
parent 043806bc9d
commit 8bfabff0bf
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tty/vt/gen_ucs_recompose.py
View File

@@ -289,8 +289,8 @@ static int recomposition_compare(const void *key, const void *element)
/**
* Attempt to recompose two Unicode characters into a single character.
*
* @param previous: Previous Unicode code point (UCS-4)
* @param current: Current Unicode code point (UCS-4)
* @param base: Base Unicode code point (UCS-4)
* @param combining: Combining mark Unicode code point (UCS-4)
* Return: Recomposed Unicode code point, or 0 if no recomposition is possible
*/
uint32_t ucs_recompose(uint32_t base, uint32_t combining)
@@ -301,7 +301,6 @@ uint32_t ucs_recompose(uint32_t base, uint32_t combining)
return 0;
struct compare_key key = {{ base, combining }};
struct recomposition *result =
__inline_bsearch(&key, recomposition_table,
ARRAY_SIZE(recomposition_table),

4
drivers/tty/vt/gen_ucs_width.py
View File

@@ -292,7 +292,7 @@ static bool is_in_interval32(uint32_t cp, const struct interval32 *intervals, si
/**
* Determine if a Unicode code point is zero-width.
*
* @param ucs: Unicode code point (UCS-4)
* @param cp: Unicode code point (UCS-4)
* Return: true if the character is zero-width, false otherwise
*/
bool ucs_is_zero_width(uint32_t cp)
@@ -305,7 +305,7 @@ bool ucs_is_zero_width(uint32_t cp)
/**
* Determine if a Unicode code point is double-width.
*
* @param ucs: Unicode code point (UCS-4)
* @param cp: Unicode code point (UCS-4)
* Return: true if the character is double-width, false otherwise
*/
bool ucs_is_double_width(uint32_t cp)

5
drivers/tty/vt/ucs_recompose.c
View File

@@ -147,8 +147,8 @@ static int recomposition_compare(const void *key, const void *element)
/**
* Attempt to recompose two Unicode characters into a single character.
*
* @param previous: Previous Unicode code point (UCS-4)
* @param current: Current Unicode code point (UCS-4)
* @param base: Base Unicode code point (UCS-4)
* @param combining: Combining mark Unicode code point (UCS-4)
* Return: Recomposed Unicode code point, or 0 if no recomposition is possible
*/
uint32_t ucs_recompose(uint32_t base, uint32_t combining)
@@ -159,7 +159,6 @@ uint32_t ucs_recompose(uint32_t base, uint32_t combining)
return 0;
struct compare_key key = { base, combining };
struct recomposition *result =
__inline_bsearch(&key, recomposition_table,
ARRAY_SIZE(recomposition_table),

4
drivers/tty/vt/ucs_width.c
View File

@@ -512,7 +512,7 @@ static bool is_in_interval32(uint32_t cp, const struct interval32 *intervals, si
/**
* Determine if a Unicode code point is zero-width.
*
* @param ucs: Unicode code point (UCS-4)
* @param cp: Unicode code point (UCS-4)
* Return: true if the character is zero-width, false otherwise
*/
bool ucs_is_zero_width(uint32_t cp)
@@ -525,7 +525,7 @@ bool ucs_is_zero_width(uint32_t cp)
/**
* Determine if a Unicode code point is double-width.
*
* @param ucs: Unicode code point (UCS-4)
* @param cp: Unicode code point (UCS-4)
* Return: true if the character is double-width, false otherwise
*/
bool ucs_is_double_width(uint32_t cp)