osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Calls to col_...() and expert...() functions should not be under 'if (tree)'; 

Remove unneeded #include;
Convert "4 space tabs" to spaces;
Remove trailing whitespace;
Add svn:id and svn:eol-style properties.

svn path=/trunk/; revision=43891
This commit is contained in:
Bill Meier 2012-07-21 14:03:46 +00:00
parent 6ed0c79956
commit 918f05baa8
1 changed files with 3168 additions and 3172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-sprt.c
View File

@ -43,7 +43,6 @@
#include <epan/prefs.h>
#include <epan/conversation.h>
#include <epan/expert.h>
#include <epan/tfs.h>
#include "packet-sprt.h"
@ -1124,7 +1123,7 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Set up structures needed to add the protocol subtree and manage it */
proto_item *ti;
proto_tree *sprt_tree = NULL;
proto_tree *sprt_ack_field_tree = NULL;
proto_tree *sprt_ack_field_tree;
guint16 word1;
unsigned int offset = 0;
guint payload_length;
@ -1204,8 +1203,6 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
p_conv_data = find_sprt_conversation_data(pinfo);
}
if(tree)
{
proto_tree_add_item(sprt_tree, hf_sprt_header_extension_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sprt_tree, hf_sprt_subsession_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
@ -1250,7 +1247,6 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(noa)
col_append_fstr(pinfo->cinfo, COL_INFO, " (ACK fields present)");
}
return tvb_length(tvb);
}