diff options
| author | Charlie Brej <cbrej@cs.man.ac.uk> | 2010-08-04 17:46:37 +0100 |
|---|---|---|
| committer | Charlie Brej <cbrej@cs.man.ac.uk> | 2010-08-04 17:46:37 +0100 |
| commit | c767c5017401639b4d44f68fb014895a2f86c07d (patch) | |
| tree | 9523e3275b1a4322a315fcd0c06f97c7d585d173 | |
| parent | 06b56d4a6eb76329b9d8a8f1681f083c10ce637e (diff) | |
Fix fork backend from calling itself on sub-databases
| -rw-r--r-- | src/libtidbit/tidbit-database-fork.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libtidbit/tidbit-database-fork.c b/src/libtidbit/tidbit-database-fork.c index fc6fc49..5d4c8f1 100644 --- a/src/libtidbit/tidbit-database-fork.c +++ b/src/libtidbit/tidbit-database-fork.c @@ -28,11 +28,13 @@ static void tidbit_database_fork_free (PtrTidbitDatabase database); static unsigned int tidbit_database_fork_insert (PtrTidbitDatabase database, PtrTidbitRecord record); static PtrTidbitRecord tidbit_database_fork_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid); +static PtrTidbitGuidSet tidbit_database_fork_query (PtrTidbitDatabase database, PtrTidbitQuery query); static TidbitDatabaseFunctions backend_functions = { &tidbit_database_fork_free, &tidbit_database_fork_insert, - &tidbit_database_fork_fetch + &tidbit_database_fork_fetch, + &tidbit_database_fork_query, }; @@ -72,11 +74,11 @@ static PtrTidbitRecord tidbit_database_fork_fetch (PtrTidbitDatabase database, P return record; } -PtrTidbitGuidSet tidbit_database_fork_query (PtrTidbitDatabase database, PtrTidbitQuery query) +static PtrTidbitGuidSet tidbit_database_fork_query (PtrTidbitDatabase database, PtrTidbitQuery query) { PtrTidbitDatabaseFork backend = GET_FORK_BACKEND(database); - PtrTidbitGuidSet guid_set_a = tidbit_database_fork_query (backend->sub_a, query); - PtrTidbitGuidSet guid_set_b = tidbit_database_fork_query (backend->sub_a, query); + PtrTidbitGuidSet guid_set_a = tidbit_database_query (backend->sub_a, query); + PtrTidbitGuidSet guid_set_b = tidbit_database_query (backend->sub_a, query); PtrTidbitGuidSet guid_set = tidbit_guid_set_merge (guid_set_a, guid_set_b); tidbit_guid_set_unref (guid_set_a); tidbit_guid_set_unref (guid_set_b); |