mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 11:28:32 +00:00
ipvs: Use min3() in ip_vs_dbg_callid()
There are two motivations for this: 1. It improves readability to my eyes 2. Using nested min() calls results in a shadowed _min1 variable, which is a bit untidy. Sparse complained about this. I have also replaced (size_t)64 with a variable of type size_t and value 64. This also improves readability to my eyes. Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
parent
9fd0fa7ac3
commit
9c37510b8f
1 changed files with 2 additions and 1 deletions
|
@ -13,7 +13,8 @@ static const char *ip_vs_dbg_callid(char *buf, size_t buf_len,
|
|||
const char *callid, size_t callid_len,
|
||||
int *idx)
|
||||
{
|
||||
size_t len = min(min(callid_len, (size_t)64), buf_len - *idx - 1);
|
||||
size_t max_len = 64;
|
||||
size_t len = min3(max_len, callid_len, buf_len - *idx - 1);
|
||||
memcpy(buf + *idx, callid, len);
|
||||
buf[*idx+len] = '\0';
|
||||
*idx += len + 1;
|
||||
|
|
Loading…
Reference in a new issue