net: ipv4: fix clang -Wformat warnings
Subsystems (3)
PATCH v2 1/1 net: ipv4: fix clang -Wformat warnings
When building with Clang we encounter these warnings:
| net/ipv4/ah4.c:513:4: error: format specifies type 'unsigned short' but | the argument has type 'int' [-Werror,-Wformat] | aalg_desc->uinfo.auth.icv_fullbits / 8); - | net/ipv4/esp4.c:1114:5: error: format specifies type 'unsigned short' | but the argument has type 'int' [-Werror,-Wformat] | aalg_desc->uinfo.auth.icv_fullbits / 8);
aalg_desc->uinfo.auth.icv_fullbits is a u16 but due to default argument promotion becomes an int.
Variadic functions (printf-like) undergo default argument promotion. Documentation/core-api/printk-formats.rst specifically recommends using the promoted-to-type's format flag.
As per C11 6.3.1.1:
(https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1548.pdf) If an int can represent all values of the original type ..., the value is converted to an int; otherwise, it is converted to an unsigned int. These are called the integer promotions. Thus it makes sense to change %hu to %d not only to follow this standard but to suppress the warning as well.
---
diff from v1 -> v2:
* packaged two related patches together: (Suggested by Nick)
- https://lore.kernel.org/all/[email protected]/
- https://lore.kernel.org/all/[email protected]/
* use Joe's suggestion regarding %u over %d.
net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv4/ah4.c +1 -1
@@ -507,7 +507,7 @@ static int ah_init_state(struct xfrm_state *x)if (aalg_desc->uinfo.auth.icv_fullbits/8 !=crypto_ahash_digestsize (ahash)) { -pr_info ("%s: %s digestsize %u != %hu\n" , +pr_info ("%s: %s digestsize %u != %u\n" , __func__, x->aalg->alg_name,crypto_ahash_digestsize (ahash), aalg_desc->uinfo.auth.icv_fullbits /8 );
net/ipv4/esp4.c +1 -1
@@ -1108,7 +1108,7 @@ static int esp_init_authenc(struct xfrm_state *x) err = -EINVAL ;if (aalg_desc->uinfo.auth.icv_fullbits /8 !=crypto_aead_authsize (aead)) { -pr_info ("ESP: %s digestsize %u != %hu\n" , +pr_info ("ESP: %s digestsize %u != %u\n" , x->aalg->alg_name,crypto_aead_authsize (aead), aalg_desc->uinfo.auth.icv_fullbits /8 );
Signature · 1 line
2.37.0.rc0.161.g10f37bed90-goog
Quoted 24 lines · Justin Stitt
When building with Clang we encounter these warnings:
| net/ipv4/ah4.c:513:4: error: format specifies type 'unsigned short' but | the argument has type 'int' [-Werror,-Wformat] | aalg_desc->uinfo.auth.icv_fullbits / 8); - | net/ipv4/esp4.c:1114:5: error: format specifies type 'unsigned short' | but the argument has type 'int' [-Werror,-Wformat] | aalg_desc->uinfo.auth.icv_fullbits / 8);
aalg_desc->uinfo.auth.icv_fullbitsis a u16 but due to default argument promotion becomes an int.Variadic functions (printf-like) undergo default argument promotion.
Documentation/core-api/printk-formats.rstspecifically recommends using the promoted-to-type's format flag.As per C11 6.3.1.1:
(https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1548.pdf)If an int can represent all values of the original type ..., the value is converted to an int; otherwise, it is converted to an unsigned int. These are called the integer promotions.Thus it makes sense to change %hu to %d not only to follow this standard but to suppress the warning as well.
Quoted 5 lines
Signed-off-by Justin Stitt <[email protected]>Suggested-by Joe Perches <[email protected]>Suggested-by Nathan Chancellor <[email protected]>Suggested-by Nick Desaulniers <[email protected]>
Applied to the ipsec tree, thanks a lot!