Fix: change order of _cds_lfht_new_with_alloc parameters

The "flavor" parameter should come before the "alloc" parameter
to match the order of cds_lfht_new_with_flavor_alloc() parameters.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Ia704a0fd9cb90af966464e25e6202fed1a952eed

diff --git a/include/urcu/rculfhash.h b/include/urcu/rculfhash.h
index 8b57cd87f82a5ce5893a785afaf691cdd95cb2b1..e0f4b351fc9b027a32ecee2c1e8a958b3ce21b2f 100644 (file)
--- a/include/urcu/rculfhash.h
+++ b/include/urcu/rculfhash.h
@@ -159,8 +159,8 @@ struct cds_lfht *_cds_lfht_new_with_alloc(unsigned long init_size,
                        unsigned long max_nr_buckets,
                        int flags,
                        const struct cds_lfht_mm_type *mm,
-                       const struct cds_lfht_alloc *alloc,
                        const struct rcu_flavor_struct *flavor,
+                       const struct cds_lfht_alloc *alloc,
                        pthread_attr_t *attr);
 
 /*
@@ -248,7 +248,7 @@ struct cds_lfht *cds_lfht_new_with_flavor_alloc(unsigned long init_size,
                        pthread_attr_t *attr)
 {
        return _cds_lfht_new_with_alloc(init_size, min_nr_alloc_buckets, max_nr_buckets,
-                       flags, NULL, alloc, flavor, attr);
+                       flags, NULL, flavor, alloc, attr);
 }
 
 

diff --git a/src/rculfhash.c b/src/rculfhash.c
index 8d7c1e61e68b94992d11c0a302e541c3b48a8aa2..10f5b8ed58a89c687421b72e513e218492299a0c 100644 (file)
--- a/src/rculfhash.c
+++ b/src/rculfhash.c
@@ -1646,8 +1646,8 @@ struct cds_lfht *_cds_lfht_new_with_alloc(unsigned long init_size,
                        unsigned long max_nr_buckets,
                        int flags,
                        const struct cds_lfht_mm_type *mm,
-                       const struct cds_lfht_alloc *alloc,
                        const struct rcu_flavor_struct *flavor,
+                       const struct cds_lfht_alloc *alloc,
                        pthread_attr_t *attr)
 {
        struct cds_lfht *ht;
@@ -1714,7 +1714,7 @@ struct cds_lfht *_cds_lfht_new(unsigned long init_size,
 {
        return _cds_lfht_new_with_alloc(init_size,
                        min_nr_alloc_buckets, max_nr_buckets,
-                       flags, mm, NULL, flavor, attr);
+                       flags, mm, flavor, NULL, attr);
 }
 
 void cds_lfht_lookup(struct cds_lfht *ht, unsigned long hash,