osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

epan: Fix misuse of comma operator 

Change-Id: Ie088dea1239286cb413ddcfc2a82e4a5e3fb9e0f
Reviewed-on: https://code.wireshark.org/review/23551
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Stig Bjørlykke 2017-09-15 14:48:45 +02:00
parent 7c23f56a4d
commit b96b145f58
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dfilter/dfilter-macro.c
View File

@ -71,7 +71,7 @@ static gboolean fvt_cache_cb(proto_node * node, gpointer data _U_) {
break;
}
e = g_new(fvt_cache_entry_t,1);
e->name = finfo->hfinfo->abbrev,
e->name = finfo->hfinfo->abbrev;
e->repr = fvalue_to_string_repr(NULL, &(finfo->value), FTREPR_DFILTER, finfo->hfinfo->display);
e->usable = TRUE;
g_hash_table_insert(fvt_cache,(void*)finfo->hfinfo->abbrev,e);

2
epan/dissectors/packet-bgp.c
View File

@ -4764,7 +4764,7 @@ static int decode_evpn_nlri(proto_tree *tree, tvbuff_t *tvb, gint offset, packet
decode_evpn_nlri_esi(prefix_tree, tvb, reader_offset, pinfo);
/* move to next field */
reader_offset += 10,
reader_offset += 10;
ip_len = tvb_get_guint8(tvb, reader_offset) / 8;
proto_tree_add_item(prefix_tree, hf_bgp_evpn_nlri_iplen, tvb, reader_offset,

6
epan/dissectors/packet-bssgp.c
View File

@ -7563,9 +7563,9 @@ proto_register_bssgp(void)
ett[6] = &ett_bssgp_pfcs_to_be_set_up_list;
ett[7] = &ett_bssgp_new;
ett[8] = &ett_bssgp_pfc_flow_control_parameters_pfc;
ett[9] = &ett_bssgp_ra_id,
ett[10] = &ett_bssgp_extended_feature_bitmap,
ett[11] = &ett_bssgp_prio_class_ind,
ett[9] = &ett_bssgp_ra_id;
ett[10] = &ett_bssgp_extended_feature_bitmap;
ett[11] = &ett_bssgp_prio_class_ind;
last_offset = NUM_INDIVIDUAL_ELEMS;

4
epan/dissectors/packet-btatt.c
View File

@ -9697,7 +9697,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
if (format == 1) {
while( tvb_reported_length_remaining(tvb, offset) > 0) {
sub_item = proto_tree_add_item(main_tree, hf_btatt_information_data, tvb, offset, 4, ENC_NA),
sub_item = proto_tree_add_item(main_tree, hf_btatt_information_data, tvb, offset, 4, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_btatt_list);
offset = dissect_handle(sub_tree, pinfo, hf_btatt_handle, tvb, offset, bluetooth_data, NULL, HANDLE_TVB);
@ -9718,7 +9718,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
}
else if (format == 2) {
while( tvb_reported_length_remaining(tvb, offset) > 0) {
sub_item = proto_tree_add_item(main_tree, hf_btatt_information_data, tvb, offset, 4, ENC_NA),
sub_item = proto_tree_add_item(main_tree, hf_btatt_information_data, tvb, offset, 4, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_btatt_list);
offset = dissect_handle(sub_tree, pinfo, hf_btatt_handle, tvb, offset, bluetooth_data, NULL, HANDLE_TVB);