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

packet-frame: assorted cleanups. 

Remove unnecessary initializations.

Rename the variable for the packet ID option to match the name of the
option (it's epb_packetid in the pcapng spec, with no underscore between
"packet" and "id").
This commit is contained in:
Guy Harris 2021-08-28 23:43:44 -07:00
parent 266d707dff
commit 5e2fb6c000
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/packet-frame.c
View File

@ -343,10 +343,10 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
{
proto_item *volatile ti = NULL;
guint cap_len = 0, frame_len = 0;
guint32 pack_flags = 0;
guint32 interface_queue = 0;
guint64 drop_count = 0;
guint64 packet_id = 0;
guint32 pack_flags;
guint32 interface_queue;
guint64 drop_count;
guint64 packetid;
proto_tree *volatile tree;
proto_tree *comments_tree;
proto_tree *volatile fh_tree = NULL;
@ -671,8 +671,8 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
proto_tree_add_bitmask_list_value(flags_tree, tvb, 0, 0, flags, pack_flags);
}
if (WTAP_OPTTYPE_SUCCESS == wtap_block_get_uint64_option_value(fr_data->pkt_block, OPT_PKT_PACKETID, &packet_id)) {
proto_tree_add_uint64(fh_tree, hf_frame_packet_id, tvb, 0, 0, packet_id);
if (WTAP_OPTTYPE_SUCCESS == wtap_block_get_uint64_option_value(fr_data->pkt_block, OPT_PKT_PACKETID, &packetid)) {
proto_tree_add_uint64(fh_tree, hf_frame_packet_id, tvb, 0, 0, packetid);
}
if (wtap_block_count_option(fr_data->pkt_block, OPT_PKT_VERDICT) > 0) {