From 10bdc7a96848d230e9c2fd57d25585a2734862f6 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Mon, 20 Aug 2012 17:39:26 +0200 Subject: [PATCH] Remove the unused second IKE_SA entry match function argument LLVMs clang complains about this parameter, so remove it. --- src/libcharon/sa/ike_sa_manager.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c index 04b06c1e9..b707b6a0b 100644 --- a/src/libcharon/sa/ike_sa_manager.c +++ b/src/libcharon/sa/ike_sa_manager.c @@ -650,7 +650,7 @@ static void remove_entry_at(private_enumerator_t *this) */ static status_t get_entry_by_match_function(private_ike_sa_manager_t *this, ike_sa_id_t *ike_sa_id, entry_t **entry, u_int *segment, - linked_list_match_t match, void *p1, void *p2) + linked_list_match_t match, void *param) { table_item_t *item; u_int row, seg; @@ -662,7 +662,7 @@ static status_t get_entry_by_match_function(private_ike_sa_manager_t *this, item = this->ike_sa_table[row]; while (item) { - if (match(item->value, p1, p2)) + if (match(item->value, param)) { *entry = item->value; *segment = seg; @@ -683,7 +683,7 @@ static status_t get_entry_by_id(private_ike_sa_manager_t *this, ike_sa_id_t *ike_sa_id, entry_t **entry, u_int *segment) { return get_entry_by_match_function(this, ike_sa_id, entry, segment, - (linked_list_match_t)entry_match_by_id, ike_sa_id, NULL); + (linked_list_match_t)entry_match_by_id, ike_sa_id); } /** @@ -694,7 +694,7 @@ static status_t get_entry_by_sa(private_ike_sa_manager_t *this, ike_sa_id_t *ike_sa_id, ike_sa_t *ike_sa, entry_t **entry, u_int *segment) { return get_entry_by_match_function(this, ike_sa_id, entry, segment, - (linked_list_match_t)entry_match_by_sa, ike_sa, NULL); + (linked_list_match_t)entry_match_by_sa, ike_sa); } /**