diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-10-30 16:00:30 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-10-30 16:00:30 +0000 |
| commit | e17b9ccec18b9efaacb370ff715c19b09f1b4ea0 (patch) | |
| tree | 96ced51f0ba70bc067960c979a5243c43d4a52d7 /epan/packet.c | |
| parent | b94da93586f8af151aea9ef60e2d409761371a5a (diff) | |
Rev 29427 added packet_add_new_data_source() with a comment indicating that
the data source does not need to be allocated if (!tree).
Rev 30158 took the if (!tree) check out indicating that the check was invalid.
So: (since packet_add_new_data_source() now only calls add_new_data_source()),
remove packet_add_new_data_source().
svn path=/trunk/; revision=34717
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/epan/packet.c b/epan/packet.c index 3d8ec03e3a..cd89256975 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -225,20 +225,6 @@ add_new_data_source(packet_info *pinfo, tvbuff_t *tvb, const char *name) pinfo->data_src = g_slist_append(pinfo->data_src, src); } -/* - * This should only add a data source to the list of data sources for - * a frame if the data sources are being used. Note that they can - * be used even if the protocol tree isn't being built or isn't visible, - * e.g. if you run tshark with -x but without -V or anything else to - * cause the protocol tree to be built. - */ -void -packet_add_new_data_source(packet_info *pinfo, proto_tree *tree _U_, - tvbuff_t *tvb, const char *name) -{ - add_new_data_source(pinfo, tvb, name); -} - const char* get_data_source_name(data_source *src) { @@ -330,7 +316,7 @@ dissect_packet(epan_dissect_t *edt, union wtap_pseudo_header *pseudo_header, TRY { edt->tvb = tvb_new_real_data(pd, fd->cap_len, fd->pkt_len); /* Add this tvbuffer into the data_src list */ - packet_add_new_data_source(&edt->pi, edt->tree, edt->tvb, "Frame"); + add_new_data_source(&edt->pi, edt->tvb, "Frame"); /* Even though dissect_frame() catches all the exceptions a * sub-dissector can throw, dissect_frame() itself may throw |