X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Frculfhash.c;h=aa99c3e85a41c42e101ac5468dc88dcce9cca5c9;hb=17a8f206ce5461b5a0a551171493b5b63e592f86;hp=5b3c06b5a85ab6047cf133b3aea0ae1d0d955015;hpb=1a990de3addad89fc397f57bb359175d307e6960;p=urcu.git

diff --git a/src/rculfhash.c b/src/rculfhash.c
index 5b3c06b..aa99c3e 100644
--- a/src/rculfhash.c
+++ b/src/rculfhash.c
@@ -395,7 +395,8 @@ void cds_lfht_iter_debug_set_ht(struct cds_lfht *ht, struct cds_lfht_iter *iter)
 #else
 
 static
-void cds_lfht_iter_debug_set_ht(struct cds_lfht *ht, struct cds_lfht_iter *iter)
+void cds_lfht_iter_debug_set_ht(struct cds_lfht *ht __attribute__((unused)),
+		struct cds_lfht_iter *iter __attribute__((unused)))
 {
 }
 
@@ -581,6 +582,7 @@ unsigned int cds_lfht_fls_ulong(unsigned long x)
  * Return the minimum order for which x <= (1UL << order).
  * Return -1 if x is 0.
  */
+static
 int cds_lfht_get_count_order_u32(uint32_t x)
 {
 	if (!x)
@@ -826,7 +828,7 @@ struct cds_lfht_node *clear_flag(struct cds_lfht_node *node)
 }
 
 static
-int is_removed(struct cds_lfht_node *node)
+int is_removed(const struct cds_lfht_node *node)
 {
 	return ((unsigned long) node) & REMOVED_FLAG;
 }
@@ -1569,7 +1571,8 @@ const struct cds_lfht_mm_type *get_mm_type(unsigned long max_nr_buckets)
  * For 32-bit architectures, use the order allocator.
  */
 static
-const struct cds_lfht_mm_type *get_mm_type(unsigned long max_nr_buckets)
+const struct cds_lfht_mm_type *get_mm_type(
+		unsigned long max_nr_buckets __attribute__((unused)))
 {
 	return &cds_lfht_mm_order;
 }
@@ -1674,7 +1677,8 @@ void cds_lfht_lookup(struct cds_lfht *ht, unsigned long hash,
 	iter->next = next;
 }
 
-void cds_lfht_next_duplicate(struct cds_lfht *ht, cds_lfht_match_fct match,
+void cds_lfht_next_duplicate(struct cds_lfht *ht __attribute__((unused)),
+		cds_lfht_match_fct match,
 		const void *key, struct cds_lfht_iter *iter)
 {
 	struct cds_lfht_node *node, *next;
@@ -1708,7 +1712,8 @@ void cds_lfht_next_duplicate(struct cds_lfht *ht, cds_lfht_match_fct match,
 	iter->next = next;
 }
 
-void cds_lfht_next(struct cds_lfht *ht, struct cds_lfht_iter *iter)
+void cds_lfht_next(struct cds_lfht *ht __attribute__((unused)),
+		struct cds_lfht_iter *iter)
 {
 	struct cds_lfht_node *node, *next;
 
@@ -1830,7 +1835,7 @@ int cds_lfht_del(struct cds_lfht *ht, struct cds_lfht_node *node)
 	return ret;
 }
 
-int cds_lfht_is_node_deleted(struct cds_lfht_node *node)
+int cds_lfht_is_node_deleted(const struct cds_lfht_node *node)
 {
 	return is_removed(CMM_LOAD_SHARED(node->next));
 }
@@ -2114,7 +2119,7 @@ void cds_lfht_resize_lazy_count(struct cds_lfht *ht, unsigned long size,
 	__cds_lfht_resize_lazy_launch(ht);
 }
 
-static void cds_lfht_before_fork(void *priv)
+static void cds_lfht_before_fork(void *priv __attribute__((unused)))
 {
 	if (cds_lfht_workqueue_atfork_nesting++)
 		return;
@@ -2124,7 +2129,7 @@ static void cds_lfht_before_fork(void *priv)
 	urcu_workqueue_pause_worker(cds_lfht_workqueue);
 }
 
-static void cds_lfht_after_fork_parent(void *priv)
+static void cds_lfht_after_fork_parent(void *priv __attribute__((unused)))
 {
 	if (--cds_lfht_workqueue_atfork_nesting)
 		return;
@@ -2135,7 +2140,7 @@ end:
 	mutex_unlock(&cds_lfht_fork_mutex);
 }
 
-static void cds_lfht_after_fork_child(void *priv)
+static void cds_lfht_after_fork_child(void *priv __attribute__((unused)))
 {
 	if (--cds_lfht_workqueue_atfork_nesting)
 		return;
@@ -2157,8 +2162,9 @@ static struct urcu_atfork cds_lfht_atfork = {
  * disturb the application. The SIGRCU signal needs to be unblocked for
  * the urcu-signal flavor.
  */
-static void cds_lfht_worker_init(struct urcu_workqueue *workqueue,
-		void *priv)
+static void cds_lfht_worker_init(
+		struct urcu_workqueue *workqueue __attribute__((unused)),
+		void *priv __attribute__((unused)))
 {
 	int ret;
 	sigset_t mask;
@@ -2168,7 +2174,7 @@ static void cds_lfht_worker_init(struct urcu_workqueue *workqueue,
 		urcu_die(errno);
 	ret = sigdelset(&mask, SIGRCU);
 	if (ret)
-		urcu_die(ret);
+		urcu_die(errno);
 	ret = pthread_sigmask(SIG_SETMASK, &mask, NULL);
 	if (ret)
 		urcu_die(ret);