github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-22 06:01:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "vt: fix comment vs definition mismatch"

Browse Source 
This reverts commit 8bfabff0bf.

A new version of the series was submitted, so it's easier to revert the
old one and add the new one due to the changes invovled.

Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Jiri Slaby <jirislaby@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2025-04-26 11:20:25 +02:00
parent f92217683a
commit cb0ce93c8b
4 changed files with 10 additions and 8 deletions
Show Stats 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 base: Base Unicode code point (UCS-4)
* @param combining: Combining mark Unicode code point (UCS-4)
* @param previous: Previous Unicode code point (UCS-4)
* @param current: Current 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,6 +301,7 @@ 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 cp: Unicode code point (UCS-4)
* @param ucs: 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 cp: Unicode code point (UCS-4)
* @param ucs: 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 base: Base Unicode code point (UCS-4)
* @param combining: Combining mark Unicode code point (UCS-4)
* @param previous: Previous Unicode code point (UCS-4)
* @param current: Current 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,6 +159,7 @@ 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 cp: Unicode code point (UCS-4)
* @param ucs: 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 cp: Unicode code point (UCS-4)
* @param ucs: Unicode code point (UCS-4)
* Return: true if the character is double-width, false otherwise
*/
bool ucs_is_double_width(uint32_t cp)