osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't have two variables, in different scopes in the same routine, have 

the same name.

Fix up alignment.

svn path=/trunk/; revision=12400
This commit is contained in:
Guy Harris 2004-10-27 02:52:40 +00:00
parent 685bbf7b35
commit 816267f2c1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-per.c
View File

@ -482,12 +482,12 @@ DEBUG_ENTRY("dissect_per_constrained_sequence_of");
/* 19.6 ub>=64k or unset */
if(max_len>=65536){
guint32 old_offset=offset;
guint32 start_offset=offset;
/* semi-constrained whole number for number of elements */
/* each element encoded as 10.9 */
offset=dissect_per_length_determinant(tvb, offset, pinfo, tree, -1, &length);
length+=min_len;
proto_tree_add_uint(tree, hf_per_sequence_of_length, tvb, old_offset>>3, (offset>>3)!=(old_offset>>3)?(offset>>3)-(old_offset>>3):1, length);
proto_tree_add_uint(tree, hf_per_sequence_of_length, tvb, start_offset>>3, (offset>>3)!=(start_offset>>3)?(offset>>3)-(start_offset>>3):1, length);
goto call_sohelper;
}
@ -902,8 +902,8 @@ dissect_per_choice(tvbuff_t *tvb, guint32 offset, packet_info *pinfo, proto_tree
proto_item *it=NULL;
proto_tree *tr=NULL;
guint32 old_offset=offset;
int min_choice=INT_MAX;
int max_choice=-1;
int min_choice=INT_MAX;
int max_choice=-1;
DEBUG_ENTRY("dissect_per_choice");