aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-isakmp.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2013-10-29 21:16:50 +0000
committerJeff Morriss <jeff.morriss.ws@gmail.com>2013-10-29 21:16:50 +0000
commitf37469da6df23a1fd410dd136dae80e1ff505a4e (patch)
tree77af23b2c11179ffd069ba0fee17ab7f8ff434d8 /epan/dissectors/packet-isakmp.c
parentbd683d5ee1b24ea1bc5c08fe6ccacf71698faa50 (diff)
Remove no-longer-used parameter.
svn path=/trunk/; revision=52965
Diffstat (limited to 'epan/dissectors/packet-isakmp.c')
-rw-r--r--epan/dissectors/packet-isakmp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 2e48ccf5b1..206951c576 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -1887,7 +1887,7 @@ static proto_tree *dissect_payload_header(tvbuff_t *, int, int, int, guint8,
guint8 *, guint16 *, proto_tree *);
static void dissect_sa(tvbuff_t *, int, int, proto_tree *, int, packet_info *, void*);
-static void dissect_proposal(tvbuff_t *, int, int, proto_tree *, int, packet_info *, void*);
+static void dissect_proposal(tvbuff_t *, int, int, proto_tree *, int, void*);
static void dissect_transform(tvbuff_t *, int, int, proto_tree *, int, int, void*);
static void dissect_key_exch(tvbuff_t *, int, int, proto_tree *, int, packet_info *, void*);
static void dissect_id(tvbuff_t *, int, int, proto_tree *, int, packet_info *);
@@ -2615,7 +2615,7 @@ dissect_payloads(tvbuff_t *tvb, proto_tree *tree, proto_tree *parent_tree _U_,
dissect_sa(tvb, offset + 4, payload_length - 4, ntree, isakmp_version, pinfo, decr_data);
break;
case PLOAD_IKE_P:
- dissect_proposal(tvb, offset + 4, payload_length - 4, ntree, isakmp_version, pinfo, decr_data );
+ dissect_proposal(tvb, offset + 4, payload_length - 4, ntree, isakmp_version, decr_data );
break;
case PLOAD_IKE_KE:
case PLOAD_IKE2_KE:
@@ -2999,7 +2999,7 @@ dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_v
}
static void
-dissect_proposal(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_version, packet_info *pinfo, void* decr_data)
+dissect_proposal(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_version, void* decr_data)
{
guint8 protocol_id;
guint8 spi_size;
@@ -3589,12 +3589,12 @@ dissect_transform(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int i
}
static void
-dissect_key_exch(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_version,
+dissect_key_exch(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int isakmp_version,
#ifdef HAVE_LIBGCRYPT
- packet_info* pinfo,
+ packet_info* pinfo,
void* decr_data
#else
- packet_info* pinfo _U_,
+ packet_info* pinfo _U_,
void* decr_data _U_
#endif
)