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-x11.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-x11.c')
| -rw-r--r-- | epan/dissectors/packet-x11.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index 9591e07de0..ec83fea59c 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -1265,8 +1265,7 @@ static const value_string zero_is_none_vals[] = { next_tvb = tvb_new_subset(tvb, offset, length_remaining, plen); \ \ if (sep == NULL) { \ - if (check_col(pinfo->cinfo, COL_INFO)) \ - col_set_str(pinfo->cinfo, COL_INFO, str); \ + col_set_str(pinfo->cinfo, COL_INFO, str); \ sep = ":"; \ } \ \ @@ -3162,10 +3161,9 @@ static void dissect_x11_request(tvbuff_t *tvb, packet_info *pinfo, OPCODE(); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", sep, - val_to_str(opcode, state->opcode_vals, - "<Unknown opcode %d>")); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", sep, + val_to_str(opcode, state->opcode_vals, + "<Unknown opcode %d>")); proto_item_append_text(ti, ", Request, opcode: %d (%s)", opcode, val_to_str(opcode, state->opcode_vals, @@ -4794,16 +4792,14 @@ dissect_x11_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (opcode == UNKNOWN_OPCODE) { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, - "%s to unknown request", sep); + col_append_fstr(pinfo->cinfo, COL_INFO, + "%s to unknown request", sep); proto_item_append_text(ti, ", Reply to unknown request"); } else { - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", - sep, - val_to_str(opcode & 0xFF, state->opcode_vals, - "<Unknown opcode %d>")); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", + sep, + val_to_str(opcode & 0xFF, state->opcode_vals, + "<Unknown opcode %d>")); if (opcode > 0xFF) proto_item_append_text(ti, ", Reply, opcode: %d.%d (%s)", @@ -5158,11 +5154,10 @@ dissect_x11_event(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, eventcode = tvb_get_guint8(tvb, 0); sent = (eventcode & 0x80) ? "Sent-" : ""; - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s%s", - sep, sent, - val_to_str(eventcode & 0x7F, state->eventcode_vals, - "<Unknown eventcode %u>")); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s%s", + sep, sent, + val_to_str(eventcode & 0x7F, state->eventcode_vals, + "<Unknown eventcode %u>")); proto_item_append_text(ti, ", Event, eventcode: %d (%s%s)", eventcode, sent, @@ -5503,9 +5498,8 @@ dissect_x11_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, CARD8(error); errorcode = tvb_get_guint8(tvb, offset); - if (check_col(pinfo->cinfo, COL_INFO)) - col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", - sep, val_to_str(errorcode, state->errorcode_vals, "<Unknown errorcode %u>")); + col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s", + sep, val_to_str(errorcode, state->errorcode_vals, "<Unknown errorcode %u>")); proto_tree_add_uint_format(t, hf_x11_errorcode, tvb, offset, 1, errorcode, |