diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-26 11:20:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-26 11:20:25 +0200 |
| commit | cb0ce93c8ba6882c591e7776a258cfd483af5717 (patch) | |
| tree | 5dd6d3715f5ada1f8a66338652347c95734cca59 | |
| parent | f92217683a44f79759d805194d6d36af1bde6e10 (diff) | |
Revert "vt: fix comment vs definition mismatch"
This reverts commit 8bfabff0bfff8fbbe90673d1a557d15c42b4494a.
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>
| -rwxr-xr-x | drivers/tty/vt/gen_ucs_recompose.py | 5 | ||||
| -rwxr-xr-x | drivers/tty/vt/gen_ucs_width.py | 4 | ||||
| -rw-r--r-- | drivers/tty/vt/ucs_recompose.c | 5 | ||||
| -rw-r--r-- | drivers/tty/vt/ucs_width.c | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/drivers/tty/vt/gen_ucs_recompose.py b/drivers/tty/vt/gen_ucs_recompose.py index dc176d32e225..64418803e49e 100755 --- a/drivers/tty/vt/gen_ucs_recompose.py +++ b/drivers/tty/vt/gen_ucs_recompose.py @@ -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), diff --git a/drivers/tty/vt/gen_ucs_width.py b/drivers/tty/vt/gen_ucs_width.py index e65f43e2080a..c6cbc93e83f2 100755 --- a/drivers/tty/vt/gen_ucs_width.py +++ b/drivers/tty/vt/gen_ucs_width.py @@ -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) diff --git a/drivers/tty/vt/ucs_recompose.c b/drivers/tty/vt/ucs_recompose.c index 52cde1517f89..5c30c989def3 100644 --- a/drivers/tty/vt/ucs_recompose.c +++ b/drivers/tty/vt/ucs_recompose.c @@ -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), diff --git a/drivers/tty/vt/ucs_width.c b/drivers/tty/vt/ucs_width.c index 4d5a0021e33b..060aa8ae7f16 100644 --- a/drivers/tty/vt/ucs_width.c +++ b/drivers/tty/vt/ucs_width.c @@ -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) |