diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-09-15 14:48:45 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2017-09-15 13:16:52 +0000 |
| commit | b96b145f5846c0f8e34aa6f77ab0803f73bb27c2 (patch) | |
| tree | 6cfc2b1f470429eda3b702c159be9d7cc220a01f | |
| parent | 7c23f56a4d08f33becca50df67c51d1d5b6793e2 (diff) | |
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>
| -rw-r--r-- | epan/dfilter/dfilter-macro.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-bgp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-bssgp.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-btatt.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/epan/dfilter/dfilter-macro.c b/epan/dfilter/dfilter-macro.c index fd55c4456d..51babd2647 100644 --- a/epan/dfilter/dfilter-macro.c +++ b/epan/dfilter/dfilter-macro.c @@ -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); diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 310a596883..29b903ac46 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -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, diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 52e880f7d7..cfe3ea3039 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -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; diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index b48884b95e..30ab897d07 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -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); |