diff options
| -rw-r--r-- | capture_sync.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-cops.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/capture_sync.c b/capture_sync.c index da444f5b59..d07f8a6151 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -243,6 +243,7 @@ init_pipe_args(int *argc) { gboolean sync_pipe_start(capture_options *capture_opts) { char ssnap[ARGV_NUMBER_LEN]; + char sdlt[ARGV_NUMBER_LEN]; char scount[ARGV_NUMBER_LEN]; char sfilesize[ARGV_NUMBER_LEN]; char sfile_duration[ARGV_NUMBER_LEN]; @@ -297,12 +298,12 @@ sync_pipe_start(capture_options *capture_opts) { if (capture_opts->linktype != -1) { argv = sync_pipe_add_arg(argv, &argc, "-y"); #ifdef HAVE_PCAP_DATALINK_VAL_TO_NAME - g_snprintf(ssnap, ARGV_NUMBER_LEN, "%s",linktype_val_to_name(capture_opts->linktype)); + g_snprintf(sdlt, ARGV_NUMBER_LEN, "%s",linktype_val_to_name(capture_opts->linktype)); #else /* we can't get the type name, just treat it as a number */ - g_snprintf(ssnap, ARGV_NUMBER_LEN, "%d",capture_opts->linktype); + g_snprintf(sdlt, ARGV_NUMBER_LEN, "%d",capture_opts->linktype); #endif - argv = sync_pipe_add_arg(argv, &argc, ssnap); + argv = sync_pipe_add_arg(argv, &argc, sdlt); } if(capture_opts->multi_files_on) { diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 421cb8e1e8..c95a76baa9 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1805,7 +1805,7 @@ void proto_register_cops(void) { &hf_cops_subtree, { "Object Subtree", "cops.pc_subtree", - FT_UINT16, BASE_HEX, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Object Subtree", HFILL } }, { &hf_cops_pc_ds_field, @@ -2607,7 +2607,7 @@ static proto_tree * info_to_cops_subtree(tvbuff_t *tvb, proto_tree *st, int n, int offset, const char *str) { proto_item *tv; - tv = proto_tree_add_uint_format( st, hf_cops_subtree, tvb, offset, n, (guint)NULL, str); + tv = proto_tree_add_none_format( st, hf_cops_subtree, tvb, offset, n, str); return( proto_item_add_subtree( tv, ett_cops_subtree ) ); } diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index ba664e225d..2378fc2473 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -5713,7 +5713,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, proto_item *bar_parent_item; proto_tree *bar_sub_tree; - proto_tree_add_item(hdr_tree, hf_addr_ra, tvb, offset, 6, FALSE); + proto_tree_add_item(hdr_tree, hf_addr_ta, tvb, offset, 6, FALSE); offset += 6; bar_control = tvb_get_letohs(tvb, offset); |