mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
staging: media: atomisp: use umin() for strscpy size arguments
Replace open-coded ternary min expressions with umin() in strscpy() calls, as suggested by Dan Carpenter. Signed-off-by: Michael Ugrin <mugrinphoto@gmail.com> Reviewed-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
parent
7488f3e073
commit
79b29f7f26
|
|
@ -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));
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user