X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Finclude%2Fcore%2Fstore.h;h=0cee91362998d55c4f329c031572d5096e68400c;hp=f42d217ebe5dba73541d79a0de74a94d8f2081b7;hb=9a96acd759c31211aa512e174339a9c178c4eb83;hpb=b60d581597cc0210f2eb57f60b612bc182a44865

diff --git a/src/include/core/store.h b/src/include/core/store.h
index f42d217..0cee913 100644
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -288,15 +288,12 @@ typedef struct {
 	 * execute_query:
 	 * Execute a previously prepared query. The callback may expect that only
 	 * queries prepared by its respective prepare callback will be passed to
-	 * this function.
-	 *
-	 * TODO: Instead of letting the executor write directly to a string buffer
-	 *       (which cannot easily be merged with other results), let it hand
-	 *       all objects to a store-writer.
+	 * this function. The query result will be passed back via the specified
+	 * store writer.
 	 */
 	int (*execute_query)(sdb_object_t *q,
-			sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
-			sdb_object_t *user_data);
+			sdb_store_writer_t *w, sdb_object_t *wd,
+			sdb_strbuf_t *errbuf, sdb_object_t *user_data);
 } sdb_store_reader_t;
 
 /*
@@ -462,7 +459,7 @@ sdb_store_query_prepare_matcher(sdb_ast_node_t *ast);
  */
 int
 sdb_store_query_execute(sdb_store_t *store, sdb_store_query_t *m,
-		sdb_strbuf_t *buf, sdb_strbuf_t *errbuf);
+		sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf);
 
 /*
  * sdb_store_expr_create: