diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-05-18 01:29:25 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-05-18 01:29:25 +0000 |
| commit | ae5eed69374c8343d69e51ff580eceebdaf3ae4b (patch) | |
| tree | b2dca266ccedc45da3568548716be2bd729153da /epan/dissectors/packet-msrp.c | |
| parent | e357bbd68cbd2b5507c598a54b52bcbde0843960 (diff) | |
Remove code to generate an unuse sub-tree: Coverity: 976;
Don't assign to an unused variable: Coverity 977;
#include <stdlib.h> & <string.h> not req'd.
svn path=/trunk/; revision=37233
Diffstat (limited to 'epan/dissectors/packet-msrp.c')
| -rw-r--r-- | epan/dissectors/packet-msrp.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 816bd9cc34..95bc393d04 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -30,8 +30,6 @@ # include "config.h" #endif -#include <stdlib.h> -#include <string.h> #include <ctype.h> #include <glib.h> @@ -59,7 +57,6 @@ static int ett_msrp = -1; static int ett_raw_text = -1; static int ett_msrp_reqresp = -1; static int ett_msrp_hdr = -1; -static int ett_msrp_element = -1; static int ett_msrp_data = -1; static int ett_msrp_end_line = -1; static int ett_msrp_setup = -1; @@ -454,9 +451,9 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { gint offset = 0; gint next_offset = 0; - proto_item *ti, *th, *msrp_headers_item, *msrp_element_item; + proto_item *ti, *th, *msrp_headers_item; proto_tree *msrp_tree, *reqresp_tree, *raw_tree, *msrp_hdr_tree, *msrp_end_tree; - proto_tree *msrp_element_tree, *msrp_data_tree; + proto_tree *msrp_data_tree; gint linelen; gint space_offset; gint token_2_start; @@ -471,7 +468,6 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint line_end_offset; gint message_end_offset; gint colon_offset; - char *transaction_id_str = NULL; gint header_len; gint hf_index; gint value_offset; @@ -506,9 +502,6 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) space_offset = tvb_find_guint8(tvb, token_2_start, linelen-token_2_start, ' '); token_2_len = space_offset - token_2_start; - /* Transaction ID found store it for later use */ - transaction_id_str = tvb_get_ephemeral_string(tvb, token_2_start, token_2_len); - /* Look for another space in this line to indicate a 4th token */ token_3_start = space_offset + 1; space_offset = tvb_find_guint8(tvb, token_3_start,linelen-token_3_start, ' '); @@ -650,12 +643,11 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Add it to the protocol tree, * but display the line as is. */ - msrp_element_item = proto_tree_add_string_format(msrp_hdr_tree, + proto_tree_add_string_format(msrp_hdr_tree, hf_header_array[hf_index], tvb, offset, next_offset - offset, value, "%s", tvb_format_text(tvb, offset, linelen)); - msrp_element_tree = proto_item_add_subtree( msrp_element_item, ett_msrp_element); switch ( hf_index ) { @@ -774,7 +766,6 @@ proto_register_msrp(void) &ett_raw_text, &ett_msrp_reqresp, &ett_msrp_hdr, - &ett_msrp_element, &ett_msrp_data, &ett_msrp_end_line, &ett_msrp_setup |