Fix undefined NULL pointer arithmetic

[urcu.git] / rculfqueue.c

diff --git a/rculfqueue.c b/rculfqueue.c
index 85c7b880ebe0e8086f5544c995567e0e932420c5..38eddcf3a4283c2b86d2d66ee5604bf3a57b2213 100644 (file)
--- a/rculfqueue.c
+++ b/rculfqueue.c
@@ -20,33 +20,40 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/* Use the urcu symbols to select the appropriate rcu flavor at link time */
-#include "urcu.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
+#undef _LGPL_SOURCE
 #include "urcu/rculfqueue.h"
-#include "urcu/rculfqueue-static.h"
+#define _LGPL_SOURCE
+#include "urcu/static/rculfqueue.h"
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
  */
 
-void rcu_lfq_node_init(struct rcu_lfq_node *node)
+void cds_lfq_node_init_rcu(struct cds_lfq_node_rcu *node)
 {
-       _rcu_lfq_node_init(node);
+       _cds_lfq_node_init_rcu(node);
 }
 
-void rcu_lfq_init(struct rcu_lfq_queue *q)
+void cds_lfq_init_rcu(struct cds_lfq_queue_rcu *q,
+                     void queue_call_rcu(struct rcu_head *head,
+                               void (*func)(struct rcu_head *head)))
 {
-       _rcu_lfq_init(q);
+       _cds_lfq_init_rcu(q, queue_call_rcu);
 }
 
-void rcu_lfq_enqueue(struct rcu_lfq_queue *q, struct rcu_lfq_node *node)
+int cds_lfq_destroy_rcu(struct cds_lfq_queue_rcu *q)
 {
-       _rcu_lfq_enqueue(q, node);
+       return _cds_lfq_destroy_rcu(q);
 }
 
-struct rcu_lfq_node *
-rcu_lfq_dequeue(struct rcu_lfq_queue *q, void (*release)(struct urcu_ref *))
+void cds_lfq_enqueue_rcu(struct cds_lfq_queue_rcu *q, struct cds_lfq_node_rcu *node)
 {
-       return _rcu_lfq_dequeue(q, release);
+       _cds_lfq_enqueue_rcu(q, node);
+}
+
+struct cds_lfq_node_rcu *
+cds_lfq_dequeue_rcu(struct cds_lfq_queue_rcu *q)
+{
+       return _cds_lfq_dequeue_rcu(q);
 }