On Sat Apr 11 10:34:05 2026 -0700, Michael Ugrin wrote:
> Replace open-coded ternary min expressions with umin() in
> strscpy() calls, as suggested by Dan Carpenter.
>
> Signed-off-by: Michael Ugrin <[email protected]>
> Reviewed-by: Dan Carpenter <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
.../media/atomisp/pci/runtime/debug/src/ia_css_debug.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
index 58d99abe70aa..5113aa5973f3 100644
--- a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
+++ b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
@@ -1255,8 +1255,7 @@ ia_css_debug_pipe_graph_dump_stage(
while (ei[p] != ',')
p--;
/* Last comma found, copy till that comma */
- strscpy(enable_info1, ei,
- p > sizeof(enable_info1) ?
sizeof(enable_info1) : p);
+ strscpy(enable_info1, ei, umin(p,
sizeof(enable_info1)));
ei += p + 1;
l = strlen(ei);
@@ -1267,8 +1266,7 @@ ia_css_debug_pipe_graph_dump_stage(
* it is not guaranteed dword aligned
*/
- strscpy(enable_info2, ei,
- l > sizeof(enable_info2) ?
sizeof(enable_info2) : l);
+ strscpy(enable_info2, ei, umin(l,
sizeof(enable_info2)));
snprintf(enable_info,
sizeof(enable_info), "%s\\n%s",
enable_info1, enable_info2);
@@ -1279,8 +1277,7 @@ ia_css_debug_pipe_graph_dump_stage(
while (ei[p] != ',')
p--;
- strscpy(enable_info2, ei,
- p > sizeof(enable_info2) ?
sizeof(enable_info2) : p);
+ strscpy(enable_info2, ei, umin(p,
sizeof(enable_info2)));
ei += p + 1;
l = strlen(ei);
@@ -1302,7 +1299,7 @@ ia_css_debug_pipe_graph_dump_stage(
while (ei[p] != ',')
p--;
strscpy(enable_info3, ei,
- p >
sizeof(enable_info3) ? sizeof(enable_info3) : p);
+ umin(p,
sizeof(enable_info3)));
ei += p + 1;
strscpy(enable_info3, ei,
sizeof(enable_info3));
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
