diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 17:49:53 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 17:49:53 +0000 |
| commit | de68fd6eea9996ca8572220f379e376acd0181e2 (patch) | |
| tree | c874b6fd18d5b571366c0e3017b58e1fb73f3266 /epan/dissectors/packet-netbios.c | |
| parent | 14b65f91a44b89ef460df391717b2a6ac317980d (diff) | |
Removed check_col() and the occasional tree.
svn path=/trunk/; revision=49938
Diffstat (limited to 'epan/dissectors/packet-netbios.c')
| -rw-r--r-- | epan/dissectors/packet-netbios.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index abaf5f80b7..e774e7c91f 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1099,28 +1099,24 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* limit command so no table overflows */ command = MIN( command, sizeof( dissect_netb)/ sizeof(void *)); - if (check_col( pinfo->cinfo, COL_INFO)) { /* print command name */ - command_name = val_to_str(command, cmd_vals, "Unknown (0x%02x)"); - switch ( command ) { - case NB_NAME_QUERY: - name_type = get_netbios_name( tvb, offset + 12, name, (NETBIOS_NAME_LEN - 1)*4 + 1); - col_add_fstr( pinfo->cinfo, COL_INFO, "%s for %s<%02x>", - command_name, name, name_type); - break; - - case NB_NAME_RESP: - case NB_ADD_NAME: - case NB_ADD_GROUP: - name_type = get_netbios_name( tvb, offset + 28, name, (NETBIOS_NAME_LEN - 1)*4 + 1); - col_add_fstr( pinfo->cinfo, COL_INFO, "%s - %s<%02x>", - command_name, name, name_type); - break; + /* print command name */ + command_name = val_to_str(command, cmd_vals, "Unknown (0x%02x)"); + switch ( command ) { + case NB_NAME_QUERY: + name_type = get_netbios_name( tvb, offset + 12, name, (NETBIOS_NAME_LEN - 1)*4 + 1); + col_add_fstr( pinfo->cinfo, COL_INFO, "%s for %s<%02x>", command_name, name, name_type); + break; + + case NB_NAME_RESP: + case NB_ADD_NAME: + case NB_ADD_GROUP: + name_type = get_netbios_name( tvb, offset + 28, name, (NETBIOS_NAME_LEN - 1)*4 + 1); + col_add_fstr( pinfo->cinfo, COL_INFO, "%s - %s<%02x>", command_name, name, name_type); + break; default: - col_add_str( pinfo->cinfo, COL_INFO, - command_name); + col_add_str( pinfo->cinfo, COL_INFO, command_name); break; - } } if ( tree) { |