diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-08-20 11:05:03 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-08-20 15:12:59 +0000 |
| commit | 3adaf99050a0310e18673a616dd0eaf68cd159ac (patch) | |
| tree | 021543047b6ecadc0b1fe0fb529c1eae5e79acc2 /epan/dissectors/packet-ceph.c | |
| parent | ca390efcad68d92970c84d325c928e733ad30229 (diff) | |
| download | wireshark-3adaf99050a0310e18673a616dd0eaf68cd159ac.tar.gz | |
proto.h; (try to) fix bug in DISSECTOR_ASSERT_CMP... macros;
Also: re-enable use of DISSECTOR_ASSERT_CMP... macros in packet-ceph.c
Change-Id: Icee80381f5c8feb14cfc7e4033bdeb893018ce95
Reviewed-on: https://code.wireshark.org/review/3749
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-ceph.c')
| -rw-r--r-- | epan/dissectors/packet-ceph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 6d1d95162f..cbb9b1de7e 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -1693,7 +1693,7 @@ gboolean c_warn_unused(proto_tree *tree, { guint diff; -/* DISSECTOR_ASSERT_CMPUINT(start, <=, end); */ + DISSECTOR_ASSERT_CMPUINT(start, <=, end); diff = end - start; if (!diff) return FALSE; /* no unused space. */ @@ -1722,7 +1722,7 @@ gboolean c_warn_overrun(proto_tree *tree, { guint diff; -/* DISSECTOR_ASSERT_CMPUINT(start, <=, end); */ + DISSECTOR_ASSERT_CMPUINT(start, <=, end); diff = end - start; if (!diff) return FALSE; /* no unused space. */ @@ -1769,7 +1769,7 @@ static gshort c_warn_ver(proto_item *ti, gint act, gint min, gint max, c_pkt_data *data) { -/* DISSECTOR_ASSERT_CMPINT(min, <=, max); */ + DISSECTOR_ASSERT_CMPINT(min, <=, max); if (act < min) { @@ -7069,7 +7069,7 @@ int dissect_ceph(tvbuff_t *tvb, packet_info *pinfo, offt2 = c_dissect_pdu(tree, tvb, off, &data); if (!offt2) return 0; -/* DISSECTOR_ASSERT_CMPINT(offt2, ==, offt); */ + DISSECTOR_ASSERT_CMPINT(offt2, ==, offt); off = offt; } |