diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
| commit | 0f0c111119811cf1c6c9353efdaaef302aca5930 (patch) | |
| tree | 1184b3876ae3b638c401313def0c8172b475b3f0 /epan/dissectors/packet-homeplug.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-homeplug.c')
| -rw-r--r-- | epan/dissectors/packet-homeplug.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 61004f1ce0..dd621c3b9c 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -1021,8 +1021,7 @@ static void dissect_homeplug_ns(ptvcursor_t * cursor, packet_info * pinfo) proto_item * ti; /* Append Basic/Extender specifier to info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, extended ? " Extended" : " Basic"); + col_append_str(pinfo->cinfo, COL_INFO, extended ? " Extended" : " Basic"); if (!ptvcursor_tree(cursor)) return; @@ -1171,8 +1170,7 @@ static void dissect_homeplug_bc(ptvcursor_t * cursor, packet_info * pinfo) & HOMEPLUG_BC_NETWORK; /* Append Network/Local specifier to info column */ - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_str(pinfo->cinfo, COL_INFO, network ? " Network" : " Local"); + col_append_str(pinfo->cinfo, COL_INFO, network ? " Network" : " Local"); /* Call specific dissector */ if (network) @@ -1221,10 +1219,8 @@ static void dissect_homeplug_unknown(ptvcursor_t * cursor) static void dissect_homeplug_mme(ptvcursor_t * cursor, packet_info * pinfo) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_sep_str(pinfo->cinfo, COL_INFO, ", ", + col_append_sep_str(pinfo->cinfo, COL_INFO, ", ", val_to_str(homeplug_metype, homeplug_metype_vals, "Unknown 0x%x")); - } switch(homeplug_metype) { case HOMEPLUG_MME_RCE: |