diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-08-08 05:14:33 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-08-08 05:14:33 +0000 |
| commit | 1219287df3f388d8a4531a42875d5d0ae0acf8f6 (patch) | |
| tree | e73bf7e6ea17926d1b6292bfe78df6a9443332a6 /epan/dissectors/packet-isakmp.c | |
| parent | a4d1560fd1557820d69f8c8e106e368c2357340c (diff) | |
Rename variables to reflect their use and to avoid a shadowing warning.
Fix some indentation while we're at it.
svn path=/trunk/; revision=51211
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
| -rw-r--r-- | epan/dissectors/packet-isakmp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 7e78c3f084..e80b4d2831 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2697,8 +2697,8 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int offset = 0, len; isakmp_hdr_t hdr; - proto_item * ti, *fti; - proto_tree * isakmp_tree = NULL, *ftree; + proto_item * ti, *vers_item; + proto_tree * isakmp_tree = NULL, *vers_tree; int isakmp_version; #ifdef HAVE_LIBGCRYPT guint8 i_cookie[COOKIE_SIZE], *ic_key; @@ -2805,12 +2805,12 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 1; - fti = proto_tree_add_uint_format(isakmp_tree, hf_isakmp_version, tvb, offset, - 1, hdr.version, "Version: %u.%u", - hi_nibble(hdr.version), lo_nibble(hdr.version)); - ftree = proto_item_add_subtree(fti, ett_isakmp_version); - proto_tree_add_item(ftree, hf_isakmp_mjver, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(ftree, hf_isakmp_mnver, tvb, offset, 1, ENC_BIG_ENDIAN); + vers_item = proto_tree_add_uint_format(isakmp_tree, hf_isakmp_version, tvb, offset, + 1, hdr.version, "Version: %u.%u", + hi_nibble(hdr.version), lo_nibble(hdr.version)); + vers_tree = proto_item_add_subtree(vers_item, ett_isakmp_version); + proto_tree_add_item(vers_tree, hf_isakmp_mjver, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(vers_tree, hf_isakmp_mnver, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; if(isakmp_version == 1) { |