diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-12-16 00:32:24 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-12-16 00:35:09 +0100 |
| commit | 60c655413413360b65ee6bec50012d38a97830cb (patch) | |
| tree | 7beaf1b3279e084eac902f32d4b16dfe6b9ba940 /src/proto.c | |
| parent | bb3c742a726ab7893015cb0c820e1482c17a0602 (diff) | |
proto: revisit short-circuit loops over upper protocols
Move the check for NULL protocol description away from the loop to avoid
too long line.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/proto.c')
| -rw-r--r-- | src/proto.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/proto.c b/src/proto.c index 31a2f380..a013a00d 100644 --- a/src/proto.c +++ b/src/proto.c @@ -59,8 +59,9 @@ proto_find_upper(const struct proto_desc *base, unsigned int num) { unsigned int i; - for (i = 0; i < array_size(base->protocols) && base->protocols[i].desc; - i++) { + for (i = 0; i < array_size(base->protocols); i++) { + if (!base->protocols[i].desc) + break; if (base->protocols[i].num == num) return base->protocols[i].desc; } @@ -78,8 +79,9 @@ int proto_find_num(const struct proto_desc *base, { unsigned int i; - for (i = 0; i < array_size(base->protocols) && base->protocols[i].desc; - i++) { + for (i = 0; i < array_size(base->protocols); i++) { + if (!base->protocols[i].desc) + break; if (base->protocols[i].desc == desc) return base->protocols[i].num; } @@ -107,9 +109,9 @@ int proto_dev_type(const struct proto_desc *desc, uint16_t *res) *res = dev_proto_desc[i].type; return 0; } - for (j = 0; j < array_size(base->protocols) && - base->protocols[j].desc; - j++) { + for (j = 0; j < array_size(base->protocols); j++) { + if (!base->protocols[j].desc) + break; if (base->protocols[j].desc == desc) { *res = dev_proto_desc[i].type; return 0; |