diff options
author | Anders Broman <anders.broman@ericsson.com> | 2019-07-10 16:33:20 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2019-07-10 16:49:37 +0000 |
commit | 850713cc8d1f5486329a4781f5a8877293cc62c7 (patch) | |
tree | 279a9520beffe478bf86fa5b641fec725d4bbdd3 /epan/dissectors/packet-sna.c | |
parent | b88f840409a89b023874464912a50d4f5eb69c75 (diff) |
doxygen: Try to fix warnings.
Change-Id: I1517c968f05e7d9c6b561c0f5a7c6a059462d175
Reviewed-on: https://code.wireshark.org/review/33889
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-sna.c')
-rw-r--r-- | epan/dissectors/packet-sna.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 6ace76d644..38a58207c8 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -825,7 +825,7 @@ static void dissect_fid (tvbuff_t*, packet_info*, proto_tree*, proto_tree*); static void dissect_nlp (tvbuff_t*, packet_info*, proto_tree*, proto_tree*); static void dissect_gds (tvbuff_t*, packet_info*, proto_tree*, proto_tree*); static void dissect_rh (tvbuff_t*, int, proto_tree*); -static void dissect_control(tvbuff_t*, int, int, proto_tree*, int, enum parse); +static void dissect_sna_control(tvbuff_t*, int, int, proto_tree*, int, enum parse); static int sna_fid_to_str_buf(const address *addr, gchar *buf, int buf_len _U_) { @@ -904,7 +904,7 @@ dissect_optional_0d(tvbuff_t *tvb, proto_tree *tree) while (tvb_offset_exists(tvb, offset)) { len = tvb_get_guint8(tvb, offset+0); if (len) { - dissect_control(tvb, offset, len, tree, 1, LT); + dissect_sna_control(tvb, offset, len, tree, 1, LT); pad = (len+3) & 0xfffc; if (pad > len) proto_tree_add_item(tree, hf_sna_padding, tvb, offset+len, pad-len, ENC_NA); @@ -1026,7 +1026,7 @@ dissect_optional_14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(sub_tree, hf_sna_nlp_opti_14_si_alive, tvb, offset+12, 4, ENC_BIG_ENDIAN); - dissect_control(tvb, offset+16, len-16, sub_tree, 1, LT); + dissect_sna_control(tvb, offset+16, len-16, sub_tree, 1, LT); pad = (len+3) & 0xfffc; if (pad > len) @@ -1062,7 +1062,7 @@ dissect_optional_14(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) while (num) { sublen = tvb_get_guint8(tvb, offset); if (sublen) { - dissect_control(tvb, offset, sublen, sub_tree, 1, LT); + dissect_sna_control(tvb, offset, sublen, sub_tree, 1, LT); } else { /* Invalid */ call_data_dissector(tvb_new_subset_remaining(tvb, offset), pinfo, tree); @@ -1332,7 +1332,7 @@ dissect_nlp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (((thdr_9 & 0x18) == 0x08) && ((thdr_len << 2) > subindx)) { counter = tvb_get_guint8(tvb, indx + subindx); if (tvb_get_guint8(tvb, indx+subindx+1) == 5) - dissect_control(tvb, indx + subindx, counter+2, nlp_tree, 1, LT); + dissect_sna_control(tvb, indx + subindx, counter+2, nlp_tree, 1, LT); else call_data_dissector(tvb_new_subset_length_caplen(tvb, indx + subindx, counter+2, -1), pinfo, nlp_tree); @@ -1399,7 +1399,7 @@ dissect_xid2(tvbuff_t *tvb, proto_tree *tree) while (tvb_offset_exists(tvb, offset)) { dlen = tvb_get_guint8(tvb, offset+1); - dissect_control(tvb, offset, dlen+2, tree, 0, KL); + dissect_sna_control(tvb, offset, dlen+2, tree, 0, KL); offset += (dlen + 2); } } @@ -1487,7 +1487,7 @@ dissect_xid3(tvbuff_t *tvb, proto_tree *tree) while (tvb_offset_exists(tvb, offset)) { dlen = tvb_get_guint8(tvb, offset+1); - dissect_control(tvb, offset, dlen+2, tree, 0, KL); + dissect_sna_control(tvb, offset, dlen+2, tree, 0, KL); offset += (dlen+2); } } @@ -2258,7 +2258,7 @@ dissect_control_05hpr(tvbuff_t *tvb, proto_tree *tree, int hpr, len = tvb_get_guint8(tvb, offset+1); } if (len) { - dissect_control(tvb, offset, len, tree, hpr, parse); + dissect_sna_control(tvb, offset, len, tree, hpr, parse); pad = (len+3) & 0xfffc; if (pad > len) { proto_tree_add_item(tree, hf_sna_padding, tvb, offset+len, pad-len, ENC_NA); @@ -2297,7 +2297,7 @@ dissect_control_0e(tvbuff_t *tvb, proto_tree *tree) } static void -dissect_control(tvbuff_t *parent_tvb, int offset, int control_len, +dissect_sna_control(tvbuff_t *parent_tvb, int offset, int control_len, proto_tree *tree, int hpr, enum parse parse) { tvbuff_t *tvb; |