Browse Source

Replace inline functions with macros.

Stefano Cossu 1 year ago
parent
commit
3c36da23a4
2 changed files with 8 additions and 41 deletions
  1. 8 27
      include/graph.h
  2. 0 14
      src/graph.c

+ 8 - 27
include/graph.h

@@ -63,9 +63,8 @@ LSUP_graph_copy_contents_txn (
 
 
 /// Non-transactional version of #LSUP_graph_copy_contents_txn.
-inline LSUP_rc
-LSUP_graph_copy_contents (const LSUP_Graph *src, LSUP_Graph *dest)
-{ return LSUP_graph_copy_contents_txn (NULL, src, dest); }
+#define LSUP_graph_copy_contents(...) \
+    LSUP_graph_copy_contents_txn (NULL, __VA_ARGS__)
 
 
 /** Perform a boolean operation between two graphs.
@@ -95,11 +94,7 @@ LSUP_graph_bool_op_txn (
 
 
 /// Non-transactional version of #LSUP_graph_bool_op_txn.
-inline LSUP_rc
-LSUP_graph_bool_op (
-        const LSUP_bool_op op,
-        const LSUP_Graph *gr1, const LSUP_Graph *gr2, LSUP_Graph *res)
-{ return LSUP_graph_bool_op_txn (NULL, op, gr1, gr2, res); }
+#define LSUP_graph_bool_op(...) LSUP_graph_bool_op_txn (NULL, __VA_ARGS__)
 
 
 /** @brief Free a graph.
@@ -262,9 +257,7 @@ LSUP_graph_add_init_txn (void *txn, LSUP_Graph *gr);
 
 
 /// Non-transactional version of #LSUP_graph_init_txn.
-inline LSUP_GraphIterator *
-LSUP_graph_add_init (LSUP_Graph *gr)
-{ return LSUP_graph_add_init_txn (NULL, gr); }
+#define LSUP_graph_add_init(...) LSUP_graph_add_init_txn (NULL, __VA_ARGS__)
 
 
 /** @brief Add a single triple to the store.
@@ -279,9 +272,7 @@ LSUP_graph_add_iter_txn (
 
 
 /// Non-transactional version of #LSUP_graph_add_iter_txn.
-inline LSUP_rc
-LSUP_graph_add_iter (LSUP_GraphIterator *it, const LSUP_Triple *spo)
-{ return LSUP_graph_add_iter_txn (NULL, it, spo); }
+#define LSUP_graph_add_iter(...) LSUP_graph_add_iter_txn (NULL, __VA_ARGS__)
 
 
 /** @brief Finalize an add iteration loop and free the iterator.
@@ -313,10 +304,7 @@ LSUP_graph_add_txn (
 
 
 /// Non-transactional version of #LSUP_graph_add_txn.
-inline LSUP_rc
-LSUP_graph_add (
-        LSUP_Graph *gr, const LSUP_Triple trp[], size_t *ct)
-{ return LSUP_graph_add_txn (NULL, gr, trp, ct); }
+#define LSUP_graph_add(...) LSUP_graph_add_txn (NULL, __VA_ARGS__)
 
 
 /** @brief Delete triples by a matching pattern.
@@ -337,11 +325,7 @@ LSUP_graph_remove_txn (
 
 
 /// Non-transactional version of #LSUP_graph_remove_txn.
-inline LSUP_rc
-LSUP_graph_remove (
-        LSUP_Graph *gr, const LSUP_Term *s, const LSUP_Term *p,
-        const LSUP_Term *o, size_t *ct)
-{ return LSUP_graph_remove_txn (NULL, gr, s, p, o, ct); }
+#define LSUP_graph_remove(...) LSUP_graph_remove_txn (NULL, __VA_ARGS__)
 
 
 /** Look up triples by a matching pattern and yield an iterator.
@@ -362,10 +346,7 @@ LSUP_graph_lookup_txn (void *txn, const LSUP_Graph *gr, const LSUP_Term *s,
 
 
 /// Non-transactional version of #LSUP_graph_lookup_txn.
-inline LSUP_GraphIterator *
-LSUP_graph_lookup (const LSUP_Graph *gr, const LSUP_Term *s,
-        const LSUP_Term *p, const LSUP_Term *o, size_t *ct)
-{ return LSUP_graph_lookup_txn (NULL, gr, s, p, o, ct); }
+#define LSUP_graph_lookup(...) LSUP_graph_lookup_txn (NULL, __VA_ARGS__)
 
 
 /** @brief Advance a cursor obtained by a lookup and return a matching triple.

+ 0 - 14
src/graph.c

@@ -728,17 +728,3 @@ graph_iter_alloc_buffers (LSUP_GraphIterator *it)
  */
 
 size_t LSUP_graph_size (const LSUP_Graph *gr);
-LSUP_rc LSUP_graph_bool_op (
-        const LSUP_bool_op op,
-        const LSUP_Graph *gr1, const LSUP_Graph *gr2, LSUP_Graph *res);
-LSUP_rc LSUP_graph_copy_contents (const LSUP_Graph *src, LSUP_Graph *dest);
-LSUP_GraphIterator *LSUP_graph_add_init (LSUP_Graph *gr);
-LSUP_rc LSUP_graph_add_iter (LSUP_GraphIterator *it, const LSUP_Triple *spo);
-LSUP_rc LSUP_graph_add (LSUP_Graph *gr, const LSUP_Triple trp[], size_t *ct);
-LSUP_rc LSUP_graph_remove (
-        LSUP_Graph *gr, const LSUP_Term *s, const LSUP_Term *p,
-        const LSUP_Term *o, size_t *ct);
-LSUP_GraphIterator *
-LSUP_graph_lookup (const LSUP_Graph *gr, const LSUP_Term *s,
-        const LSUP_Term *p, const LSUP_Term *o, size_t *ct);
-