expr: numgen: use switch to handle numgen types from snprintf
Pablo Neira Ayuso
maintainerPATCH 1/3 expr: numgen: use switch to handle numgen types from snprintf
Use switch instead of if branch.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/expr/numgen.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
src/expr/numgen.c +5 -4
@@ -189,16 +189,17 @@ nftnl_expr_ng_snprintf_default(char *buf, size_t size,struct nftnl_expr_ng *ng =nftnl_expr_data (e);int len = size, offset =0 , ret; -if (ng->type ==NFT_NG_INCREMENTAL ) { +switch (ng->type) { +case NFT_NG_INCREMENTAL : ret =snprintf (buf, len,"reg %u = inc(%u)" , ng->dreg, ng->until);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); - } - -if (ng->type ==NFT_NG_RANDOM ) { +break ; +case NFT_NG_RANDOM : ret =snprintf (buf, len,"reg %u = random(%u)" , ng->dreg, ng->until);SNPRINTF_BUFFER_SIZE (ret, size, len, offset); +break ; }return offset;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 2/3 expr: numgen: add missing trailing whitespace
Before patch:
[ numgen reg 1 = inc(2)]
After patch:
[ numgen reg 1 = inc(2) ]
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/expr/numgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
src/expr/numgen.c +2 -2
@@ -191,12 +191,12 @@ nftnl_expr_ng_snprintf_default(char *buf, size_t size,switch (ng->type) {case NFT_NG_INCREMENTAL : - ret =snprintf (buf, len,"reg %u = inc(%u)" , ng->dreg, + ret =snprintf (buf, len,"reg %u = inc(%u) " , ng->dreg, ng->until);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);break ;case NFT_NG_RANDOM : - ret =snprintf (buf, len,"reg %u = random(%u)" , ng->dreg, + ret =snprintf (buf, len,"reg %u = random(%u) " , ng->dreg, ng->until);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);break ;
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerPATCH 3/3 expr: hash: missing trailing space and modulus in hexadecimal in snprintf
In reply to Pablo Neira AyusoBefore patch:
[ hash reg 1 = jhash(reg 2, 8, 3735928559) % modulus 2]
After patch:
[ hash reg 1 = jhash(reg 2, 8, 0xdeadbeef) % mod 2 ]
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/expr/hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/expr/hash.c +1 -1
@@ -235,7 +235,7 @@ nftnl_expr_hash_snprintf_default(char *buf, size_t size,struct nftnl_expr_hash *hash =nftnl_expr_data (e);int len = size, offset =0 , ret; - ret =snprintf (buf, len,"reg %u = jhash(reg %u, %u, %u) %% modulus %u" , + ret =snprintf (buf, len,"reg %u = jhash(reg %u, %u, 0x%x) %% mod %u " , hash->dreg, hash->sreg, hash->len, hash->seed, hash->modulus);SNPRINTF_BUFFER_SIZE (ret, size, len, offset);
Signature · 1 line
2.1.4