diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-05-20 15:44:25 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-05-20 15:44:25 +0000 |
| commit | f3432a973c8bd979334674740903956c55e7cff9 (patch) | |
| tree | 8decbb3e16d7182eeb1c189ee81e6d7ef0b74812 /epan/dissectors/packet-rtp.c | |
| parent | 4910bc142fcf8072e26179a4fe77c257ecc20225 (diff) | |
Don't assign to a proto_item* if the value won't be used:
Fixes Coverity 903,935,968,985,997,999,1024,1025,1134;
Remove unneeded #includes;
Do whitespace cleanup.
svn path=/trunk/; revision=37331
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 7cf87e6d21..43a693c275 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -60,11 +60,8 @@ # include "config.h" #endif -#include <glib.h> #include <epan/packet.h> -#include <stdio.h> - #include "packet-rtp.h" #include <epan/rtp_pt.h> #include <epan/conversation.h> @@ -119,19 +116,19 @@ static gint ett_rtp_fragment = -1; static gint ett_rtp_fragments = -1; static const fragment_items rtp_fragment_items = { - &ett_rtp_fragment, - &ett_rtp_fragments, - &hf_rtp_fragments, - &hf_rtp_fragment, - &hf_rtp_fragment_overlap, - &hf_rtp_fragment_overlap_conflict, - &hf_rtp_fragment_multiple_tails, - &hf_rtp_fragment_too_long_fragment, - &hf_rtp_fragment_error, - &hf_rtp_fragment_count, - &hf_rtp_reassembled_in, - &hf_rtp_reassembled_length, - "RTP fragments" + &ett_rtp_fragment, + &ett_rtp_fragments, + &hf_rtp_fragments, + &hf_rtp_fragment, + &hf_rtp_fragment_overlap, + &hf_rtp_fragment_overlap_conflict, + &hf_rtp_fragment_multiple_tails, + &hf_rtp_fragment_too_long_fragment, + &hf_rtp_fragment_error, + &hf_rtp_fragment_count, + &hf_rtp_reassembled_in, + &hf_rtp_reassembled_length, + "RTP fragments" }; static dissector_handle_t rtp_handle; @@ -1358,7 +1355,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree_add_boolean( rtp_tree, hf_rtp_marker, tvb, offset, 1, octet2 ); - item = proto_tree_add_uint_format( rtp_tree, hf_rtp_payload_type, tvb, + proto_tree_add_uint_format( rtp_tree, hf_rtp_payload_type, tvb, offset, 1, octet2, "Payload type: %s (%u)", payload_type_str ? payload_type_str : val_to_str_ext( payload_type, &rtp_payload_type_vals_ext,"Unknown"), payload_type); |