diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 19:46:54 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 19:46:54 +0000 |
| commit | f42e5bc9c0eb6c0e228018711694c80cdc5bc5c1 (patch) | |
| tree | c84185fcaa21ac4b694206b5d263a78a22bea491 /epan/dissectors/packet-wassp.c | |
| parent | c5d092ec3a228d55fcedd88d86f78006abbd7064 (diff) | |
Remove check_col() and the occasional tree.
This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory. A small handful of check_col() calls remain outside of the dissectors.
svn path=/trunk/; revision=49941
Diffstat (limited to 'epan/dissectors/packet-wassp.c')
| -rw-r--r-- | epan/dissectors/packet-wassp.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c index 9cc9f0dad5..31d780a71c 100644 --- a/epan/dissectors/packet-wassp.c +++ b/epan/dissectors/packet-wassp.c @@ -774,8 +774,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, tvbuff_t *snmp_tvb; /* Don't add SNMP stuff to the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_writable(pinfo->cinfo, FALSE); + col_set_writable(pinfo->cinfo, FALSE); snmp_tvb = tvb_new_subset(tvb, offset, length, length); @@ -786,8 +785,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, show_exception(snmp_tvb, pinfo, wassp_tree, EXCEPT_CODE, GET_MESSAGE); } ENDTRY; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_writable(pinfo->cinfo, TRUE); + col_set_writable(pinfo->cinfo, TRUE); offset += length; @@ -801,8 +799,7 @@ dissect_ieee80211(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, tvbuff_t *ieee80211_tvb; /* Don't add IEEE 802.11 stuff to the info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_writable(pinfo->cinfo, FALSE); + col_set_writable(pinfo->cinfo, FALSE); ieee80211_tvb = tvb_new_subset(tvb, offset, length, length); @@ -813,8 +810,7 @@ dissect_ieee80211(tvbuff_t *tvb, packet_info *pinfo, proto_tree *wassp_tree, show_exception(ieee80211_tvb, pinfo, wassp_tree, EXCEPT_CODE, GET_MESSAGE); } ENDTRY; - if (check_col(pinfo->cinfo, COL_INFO)) - col_set_writable(pinfo->cinfo, TRUE); + col_set_writable(pinfo->cinfo, TRUE); offset += length; @@ -895,10 +891,8 @@ dissect_wassp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 subtype; packet_type = tvb_get_guint8(tvb, 1); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); - if (check_col(pinfo->cinfo, COL_INFO)) - col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, + col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME); + col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, wassp_tunnel_pdu_type, "Type 0x%02x")); if (tree) { |