diff options
| author | Bill Meier <wmeier@newsguy.com> | 2009-09-14 15:34:05 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2009-09-14 15:34:05 +0000 |
| commit | 02de65a8715476c63eed760e06efde2ba1dc0c86 (patch) | |
| tree | ad1bb7fd04e99dc4d3bcebc33181f3aa378573e2 /docbook/wsdg_src | |
| parent | 7b58b17af79e27c3d6eae82216988f59fa6541a7 (diff) | |
Remove usage of check_col() since no longer required.
svn path=/trunk/; revision=29898
Diffstat (limited to 'docbook/wsdg_src')
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_dissection.xml | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_dissection.xml b/docbook/wsdg_src/WSDG_chapter_dissection.xml index a0f61ed9ea..0adbd3d311 100644 --- a/docbook/wsdg_src/WSDG_chapter_dissection.xml +++ b/docbook/wsdg_src/WSDG_chapter_dissection.xml @@ -156,13 +156,9 @@ proto_reg_handoff_foo(void) <![CDATA[static void dissect_foo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FOO"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FOO"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo,COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo,COL_INFO); }]]> </programlisting></example> <para> @@ -243,13 +239,9 @@ dissect_foo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_foo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FOO"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FOO"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo,COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); - } + col_clear(pinfo->cinfo,COL_INFO); if (tree) { /* we are being asked for details */ proto_item *ti = NULL; @@ -563,17 +555,11 @@ dissect_foo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 packet_type = tvb_get_guint8(tvb, 0); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FOO"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FOO"); /* Clear out stuff in the info column */ - if (check_col(pinfo->cinfo,COL_INFO)) { - col_clear(pinfo->cinfo,COL_INFO); - } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s", - val_to_str(packet_type, packettypenames, "Unknown (0x%02x)")); - } + col_clear(pinfo->cinfo,COL_INFO); + col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s", + val_to_str(packet_type, packettypenames, "Unknown (0x%02x)")); if (tree) { /* we are being asked for details */ proto_item *ti = NULL; @@ -792,13 +778,11 @@ if (flags & FL_FRAGMENT) { /* fragmented */ NULL, msg_tree); if (frag_msg) { /* Reassembled */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, - " (Message Reassembled)"); + col_append_str(pinfo->cinfo, COL_INFO, + " (Message Reassembled)"); } else { /* Not last packet of reassembled Short Message */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, - " (Message fragment %u)", msg_num); + col_append_fstr(pinfo->cinfo, COL_INFO, + " (Message fragment %u)", msg_num); } if (new_tvb) { /* take it all */ |