diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-21 16:09:15 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-22 00:09:36 +0000 |
| commit | 147ca4568379ea400b9a7577a468908cd8bcc92f (patch) | |
| tree | 6e8bafdc98aaad44eed7cadb4f66d805f7db0a44 /epan/proto.c | |
| parent | c30aa115fe6b69f73a06589d46b3eb90635cdde5 (diff) | |
Improve the message for "this field has an integral type" assertions.
(Along the lines of provious changes.)
Change-Id: I22d76f22400d4a93242392ff4688acc753eb0039
Reviewed-on: https://code.wireshark.org/review/5961
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/proto.c b/epan/proto.c index cb2a00c183..9e17ea7330 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -7628,7 +7628,7 @@ proto_tree_add_bitmask(proto_tree *parent_tree, tvbuff_t *tvb, int len; PROTO_REGISTRAR_GET_NTH(hf_hdr,hf); - DISSECTOR_ASSERT(IS_FT_INT(hf->type) || IS_FT_UINT(hf->type)); + DISSECTOR_ASSERT_FIELD_TYPE_IS_INTEGRAL(hf); len = ftype_length(hf->type); if (parent_tree) { @@ -7652,7 +7652,7 @@ proto_tree_add_bitmask_with_flags(proto_tree *parent_tree, tvbuff_t *tvb, const int len; PROTO_REGISTRAR_GET_NTH(hf_hdr,hf); - DISSECTOR_ASSERT(IS_FT_INT(hf->type) || IS_FT_UINT(hf->type)); + DISSECTOR_ASSERT_FIELD_TYPE_IS_INTEGRAL(hf); len = ftype_length(hf->type); if (parent_tree) { @@ -7688,7 +7688,7 @@ proto_tree_add_bitmask_len(proto_tree *parent_tree, tvbuff_t *tvb, guint32 decodable_value; PROTO_REGISTRAR_GET_NTH(hf_hdr, hf); - DISSECTOR_ASSERT(IS_FT_INT(hf->type) || IS_FT_UINT(hf->type)); + DISSECTOR_ASSERT_FIELD_TYPE_IS_INTEGRAL(hf); decodable_offset = offset; decodable_len = MIN(len, (guint) ftype_length(hf->type)); |