diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-10-27 02:52:40 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-10-27 02:52:40 +0000 |
| commit | 816267f2c186f4f5172b3994c74bf19c18fa57cb (patch) | |
| tree | e7aceba1363c1a095a2156a3ae559cb36967b2cf /epan/dissectors/packet-per.c | |
| parent | 685bbf7b354143a24eb5b74be49e79231cebfc39 (diff) | |
Don't have two variables, in different scopes in the same routine, have
the same name.
Fix up alignment.
svn path=/trunk/; revision=12400
Diffstat (limited to 'epan/dissectors/packet-per.c')
| -rw-r--r-- | epan/dissectors/packet-per.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 689c88ecb7..3c6baa4938 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -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"); |