diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2016-04-21 15:03:24 +0200 |
---|---|---|
committer | Tobias Klauser <tklauser@distanz.ch> | 2016-04-21 15:03:24 +0200 |
commit | bb9eb3eaa03eecbf169489d3be83ddccf7b77815 (patch) | |
tree | 7f6fc8a0235f0a50bd3f1c0ee5e3933d5ce93b2a | |
parent | fa71d0f64d30ab81e35942a5a3bb77c464d2ad51 (diff) |
trafgen: proto: Inline proto_current_header() into its only caller
proto_lower_header() is the only caller for proto_current_header() which
already checks header_count > 0, so inline proto_current_header() and
omit the additional check and a panic() which thus can never be
triggered.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r-- | trafgen_proto.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/trafgen_proto.c b/trafgen_proto.c index 214547e..d0b5580 100644 --- a/trafgen_proto.c +++ b/trafgen_proto.c @@ -31,14 +31,6 @@ static size_t headers_count; static struct proto_hdr *registered; -static inline struct proto_hdr *proto_current_header(void) -{ - if (headers_count > 0) - return headers[headers_count - 1]; - - panic("No header was added\n"); -} - struct proto_hdr *proto_lower_header(struct proto_hdr *hdr) { struct proto_hdr *lower = NULL; @@ -161,7 +153,7 @@ struct proto_hdr *proto_lower_default_add(struct proto_hdr *hdr, struct proto_hdr *current; if (headers_count > 0) { - current = proto_current_header(); + current = headers[headers_count - 1]; if (current->layer >= proto_header_by_id(pid)->layer) goto set_proto; |