[hipl-commit] [trunk] Rev 4736: hipd: mark/remove some more unused parameters.

  • From: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 9 Jun 2010 14:45:31 +0300

Committer: Mircea Gherzan <mircea.gherzan@xxxxxxxxxxxxxx>
Date: 09/06/2010 at 14:45:31
Revision: 4736
Revision-id: mircea.gherzan@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  hipd: mark/remove some more unused parameters.

Modified:
  M  hipd/input.c
  M  hipd/oppdb.c
  M  hipd/oppdb.h
  M  hipd/oppipdb.c
  M  hipd/oppipdb.h

=== modified file 'hipd/input.c'
--- hipd/input.c        2010-06-09 09:55:23 +0000
+++ hipd/input.c        2010-06-09 11:45:06 +0000
@@ -541,9 +541,7 @@
         (type == HIP_I1 || type == HIP_R1)) {
         ctx->hadb_entry =
                 hip_oppdb_get_hadb_entry_i1_r1(ctx->input_msg,
-                                               ctx->src_addr,
-                                               ctx->dst_addr,
-                                               ctx->msg_ports);
+                                               ctx->src_addr);
     }
 #endif
 

=== modified file 'hipd/oppdb.c'
--- hipd/oppdb.c        2010-06-03 12:43:56 +0000
+++ hipd/oppdb.c        2010-06-09 11:45:06 +0000
@@ -40,6 +40,7 @@
 #include "oppdb.h"
 #include "hadb.h"
 #include "accessor.h"
+#include "lib/core/common_defines.h"
 #include "lib/core/hit.h"
 
 #define HIP_LOCK_OPP_INIT(entry)
@@ -169,10 +170,10 @@
  * an iterator function for uninitializing the opportunistic database
  *
  * @param entry the entry to be uninitialized
- * @param unused unused
+ * @param arg   needed because of the iterator signature
  * @return zero
  */
-static int hip_oppdb_uninit_wrap(hip_opp_block_t *entry, void *unused)
+static int hip_oppdb_uninit_wrap(hip_opp_block_t *entry, UNUSED void *arg)
 {
     hip_oppdb_del_entry_by_entry(entry);
     return 0;
@@ -391,14 +392,10 @@
  *
  * @param msg the I1 or R2 message
  * @param src_addr the source address of the message
- * @param dst_addr the destination address of the message
- * @param msg_info the transport layer port numbers (UDP tunnel)
  * @return the host association or NULL if not found
  */
 hip_ha_t *hip_oppdb_get_hadb_entry_i1_r1(struct hip_common *msg,
-                                         struct in6_addr *src_addr,
-                                         struct in6_addr *dst_addr,
-                                         hip_portpair_t *msg_info)
+                                         struct in6_addr *src_addr)
 {
     hip_hdr_type_t type = hip_get_msg_type(msg);
     hip_ha_t *entry     = NULL;

=== modified file 'hipd/oppdb.h'
--- hipd/oppdb.h        2010-06-01 15:11:44 +0000
+++ hipd/oppdb.h        2010-06-09 11:45:06 +0000
@@ -55,9 +55,7 @@
                           const struct sockaddr_in6 *caller);
 
 hip_ha_t *hip_oppdb_get_hadb_entry_i1_r1(struct hip_common *msg,
-                                         struct in6_addr *src_addr,
-                                         struct in6_addr *dst_addr,
-                                         hip_portpair_t *msg_info);
+                                         struct in6_addr *src_addr);
 int hip_for_each_opp(int (*func)(hip_opp_block_t *entry, void *opaq),
                      void *opaque);
 

=== modified file 'hipd/oppipdb.c'
--- hipd/oppipdb.c      2010-06-01 15:11:48 +0000
+++ hipd/oppipdb.c      2010-06-09 11:45:06 +0000
@@ -12,6 +12,7 @@
  * @author  Alberto Garcia
  */
 
+#include "lib/core/common_defines.h"
 #include "oppipdb.h"
 
 #define HIP_LOCK_OPPIP(entry)
@@ -90,9 +91,9 @@
  * Deletes an entry that is present in oppipdb hash table
  *
  * @param entry pointer to the entry to delete
- * @param not_used
+ * @param arg   needed because of the the iterator signature
  */
-void hip_oppipdb_del_entry_by_entry(hip_oppip_t *entry, void *not_used)
+void hip_oppipdb_del_entry_by_entry(hip_oppip_t *entry, UNUSED void *arg)
 {
     HIP_LOCK_OPPIP(entry);
     hip_ht_delete(oppipdb, entry);

=== modified file 'hipd/oppipdb.h'
--- hipd/oppipdb.h      2010-02-17 17:38:08 +0000
+++ hipd/oppipdb.h      2010-06-09 11:45:06 +0000
@@ -16,7 +16,7 @@
 typedef struct in6_addr hip_oppip_t;
 
 int hip_for_each_oppip(void (*func)(hip_oppip_t *entry, void *opaq), void 
*opaque);
-void hip_oppipdb_del_entry_by_entry(hip_oppip_t *entry, void *not_used);
+void hip_oppipdb_del_entry_by_entry(hip_oppip_t *entry, void *arg);
 int hip_oppipdb_add_entry(const struct in6_addr *ip_peer);
 int hip_init_oppip_db(void);
 hip_oppip_t *hip_oppipdb_find_byip(const struct in6_addr *ip_peer);

Other related posts:

  • » [hipl-commit] [trunk] Rev 4736: hipd: mark/remove some more unused parameters. - Mircea Gherzan