ACPI: processor: idle: Replace strlcat() with better alternative
PATCH v2 1/1 ACPI: processor: idle: Replace strlcat() with better alternative
strlcpy() and strlcat() are confusing APIs and the former one already gone from the kernel. In preparation to kill strlcat() replace it with the better alternative.
Signed-off-by Andy Shevchenko <[email protected]>
---
v2: moved to scnprintf() to avoid GCC warning (clang was and is okay)
drivers/acpi/processor_idle.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/acpi/processor_idle.c +1 -3
@@ -1010,9 +1010,7 @@ static bool combine_lpi_states(struct acpi_lpi_state *local, result->arch_flags = parent->arch_flags; result->index = parent->index; -strscpy (result->desc, local->desc,ACPI_CX_DESC_LEN ); -strlcat (result->desc,"+" ,ACPI_CX_DESC_LEN ); -strlcat (result->desc, parent->desc,ACPI_CX_DESC_LEN ); +scnprintf (result->desc,ACPI_CX_DESC_LEN ,"%s+%s" , local->desc, parent->desc);return true; }
Signature · 1 line
2.50.1
Quoted 19 lines · Andy Shevchenko
strlcpy()andstrlcat()are confusing APIs and the former one already gone from the kernel. In preparation to killstrlcat()replace it with the better alternative.Signed-off-by Andy Shevchenko <[email protected]>---
v2: moved to
scnprintf()to avoid GCC warning (clang was and is okay)drivers/acpi/processor_idle.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/acpi/processor_idle.c +0
-0@@ -1010,9 +1010,7 @@ static bool combine_lpi_states(struct acpi_lpi_state *local, result->arch_flags = parent->arch_flags;
drivers/acpi/processor_idle.c static bool combine_lpi_states(struct acpi_lpi_state *local,
Quoted 10 lines
drivers/acpi/processor_idle.c +1
-4result->index = parent->index; -strscpy (result->desc, local->desc,ACPI_CX_DESC_LEN ); -strlcat (result->desc,"+" ,ACPI_CX_DESC_LEN ); -strlcat (result->desc, parent->desc,ACPI_CX_DESC_LEN ); +scnprintf (result->desc,ACPI_CX_DESC_LEN ,"%s+%s" , local->desc, parent->desc);return true; } --
Applied as 7.1 material, thanks!