Move some function declerations to tidbit.h so they are extrenally visible

10 files changed, 52 insertions, 5 deletions

diff --git a/src/libtidbit/tidbit-database-dbus.h b/src/libtidbit/tidbit-database-dbus.h
index c74cf59..42bc11e 100644
--- a/src/libtidbit/tidbit-database-dbus.h
+++ b/src/libtidbit/tidbit-database-dbus.h
@@ -30,7 +30,9 @@ typedef struct TidbitDatabaseDbus{
 }TidbitDatabaseDbus, *PtrTidbitDatabaseDbus;
 
 
+/* In tidbit.h
 PtrTidbitDatabase tidbit_database_dbus_new (void);
+*/
 
 
 #endif
diff --git a/src/libtidbit/tidbit-database-fork.h b/src/libtidbit/tidbit-database-fork.h
index 38b24f8..55ed9c3 100644
--- a/src/libtidbit/tidbit-database-fork.h
+++ b/src/libtidbit/tidbit-database-fork.h
@@ -26,7 +26,8 @@ typedef struct TidbitDatabaseFork{
 }TidbitDatabaseFork, *PtrTidbitDatabaseFork;
 
 
+/* In tidbit.h
 PtrTidbitDatabase tidbit_database_fork_new (PtrTidbitDatabase sub_a, PtrTidbitDatabase sub_b);
-
+*/
 
 #endif
diff --git a/src/libtidbit/tidbit-database-http.h b/src/libtidbit/tidbit-database-http.h
index 0e8f0f9..6d431a5 100644
--- a/src/libtidbit/tidbit-database-http.h
+++ b/src/libtidbit/tidbit-database-http.h
@@ -28,7 +28,9 @@ typedef struct TidbitDatabaseHttp{
 }TidbitDatabaseHttp, *PtrTidbitDatabaseHttp;
 
 
+/* In tidbit.h
 PtrTidbitDatabase tidbit_database_http_new (void);
+*/
 
 
 #endif
diff --git a/src/libtidbit/tidbit-database-mem.h b/src/libtidbit/tidbit-database-mem.h
index 32d63c6..640e3d2 100644
--- a/src/libtidbit/tidbit-database-mem.h
+++ b/src/libtidbit/tidbit-database-mem.h
@@ -27,7 +27,9 @@ typedef struct TidbitDatabaseMem{
 }TidbitDatabaseMem, *PtrTidbitDatabaseMem;
 
 
+/* In tidbit.h
 PtrTidbitDatabase tidbit_database_mem_new (void);
+*/
 
 
 #endif
diff --git a/src/libtidbit/tidbit-database.h b/src/libtidbit/tidbit-database.h
index b16adcb..ccd4fd5 100644
--- a/src/libtidbit/tidbit-database.h
+++ b/src/libtidbit/tidbit-database.h
@@ -38,11 +38,14 @@ struct _TidbitDatabase{
 };
 
 PtrTidbitDatabase tidbit_database_new (gpointer backend, PtrTidbitDatabaseFunctions functions);
+
+/* In tidbit.h
 void tidbit_database_ref (PtrTidbitDatabase database);
 void tidbit_database_unref (PtrTidbitDatabase database);
 unsigned int tidbit_database_insert_record (PtrTidbitDatabase database, PtrTidbitRecord record);
 PtrTidbitRecord tidbit_database_fetch_record (PtrTidbitDatabase database, PtrTidbitGuid guid);
 PtrTidbitGuidSet tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+*/
 
 
 #endif
diff --git a/src/libtidbit/tidbit-guid.h b/src/libtidbit/tidbit-guid.h
index 6caeec2..955f0bc 100644
--- a/src/libtidbit/tidbit-guid.h
+++ b/src/libtidbit/tidbit-guid.h
@@ -36,7 +36,7 @@ typedef void (*TidbitGuidFunc) (PtrTidbitGuid guid, gpointer user_data);
 PtrTidbitGuid tidbit_guid_new (char* string);
 PtrTidbitGuid tidbit_guid_ref (PtrTidbitGuid guid);
 void tidbit_guid_unref (PtrTidbitGuid guid);
-int tidbit_guid_cmp (PtrTidbitGuid guid_a, PtrTidbitGuid guid_b);
+int tidbit_guid_cmp (PtrTidbitGuid guid_a, PtrTidbitGuid guid_b);           //FIXME determine the user visible functions
 const char* tidbit_guid_get_string (PtrTidbitGuid guid);
 
 PtrTidbitGuidSet tidbit_guid_set_new (void);
diff --git a/src/libtidbit/tidbit-key.h b/src/libtidbit/tidbit-key.h
index ce59b25..a9c64f5 100644
--- a/src/libtidbit/tidbit-key.h
+++ b/src/libtidbit/tidbit-key.h
@@ -39,9 +39,12 @@ struct _TidbitKey{
  } data;
 };
 
+/* In tidbit.h
 PtrTidbitKey tidbit_key_get (char* application, char* agent);
 void tidbit_key_ref (PtrTidbitKey key);
 void tidbit_key_unref (PtrTidbitKey key);
+*/
+
 char* tidbit_key_sign_data (PtrTidbitKey key, char* data);
 
 #endif
diff --git a/src/libtidbit/tidbit-query.h b/src/libtidbit/tidbit-query.h
index 66fea91..1a59053 100644
--- a/src/libtidbit/tidbit-query.h
+++ b/src/libtidbit/tidbit-query.h
@@ -36,11 +36,14 @@ struct _TidbitQuery{
 
 typedef void (*TidbitQueryForeachFunc) (PtrTidbitQueryExp expression, gpointer user_data);
 
+/* In tidbit.h
 PtrTidbitQuery tidbit_query_new (char* table_name);
 void tidbit_query_ref (PtrTidbitQuery query);
 void tidbit_query_unref (PtrTidbitQuery query);
-void tidbit_query_foreach_exp (PtrTidbitQuery query, TidbitQueryForeachFunc func, gpointer user_data);
 void tidbit_query_add_exp (PtrTidbitQuery query, char* key, char* value, TidbitQueryExpType type);
+*/
+
+void tidbit_query_foreach_exp (PtrTidbitQuery query, TidbitQueryForeachFunc func, gpointer user_data);
 gboolean tidbit_query_test_record (PtrTidbitQuery query, PtrTidbitRecord record);
 
 #endif
diff --git a/src/libtidbit/tidbit-record.h b/src/libtidbit/tidbit-record.h
index 632c4e7..a22898d 100644
--- a/src/libtidbit/tidbit-record.h
+++ b/src/libtidbit/tidbit-record.h
@@ -50,15 +50,16 @@ struct _TidbitRecord{
  char* raw;
 };
 
-
+/* In tidbit.h
 PtrTidbitRecord tidbit_record_new (char* table_name);
 void tidbit_record_ref (PtrTidbitRecord record);
 void tidbit_record_unref (PtrTidbitRecord record);
 void tidbit_record_set_ttl (PtrTidbitRecord record, int seconds, int days, int years);
 void tidbit_record_add_element (PtrTidbitRecord record, char* key, char* value);
-PtrTidbitRecordElement tidbit_record_get_element_by_key (PtrTidbitRecord record, char* key);
 char* tidbit_record_get_element_value_by_key (PtrTidbitRecord record, char* key);
 void tidbit_record_sign (PtrTidbitRecord record, PtrTidbitKey key);
+*/
+
 char* tidbit_record_get_raw (PtrTidbitRecord record);
 PtrTidbitRecord tidbit_record_from_raw (char* raw);
 
diff --git a/src/libtidbit/tidbit.h b/src/libtidbit/tidbit.h
index 2955460..d58810c 100644
--- a/src/libtidbit/tidbit.h
+++ b/src/libtidbit/tidbit.h
@@ -40,4 +40,34 @@ TIDBIT_QUERY_EXP_TYPE_LT = '<',
 TIDBIT_QUERY_EXP_TYPE_LE = '<' | '=' << 8,
 } TidbitQueryExpType;
 
+
+PtrTidbitKey tidbit_key_get (char* application, char* agent);
+void tidbit_key_ref (PtrTidbitKey key);
+void tidbit_key_unref (PtrTidbitKey key);
+
+PtrTidbitRecord tidbit_record_new (char* table_name);
+void tidbit_record_ref (PtrTidbitRecord record);
+void tidbit_record_unref (PtrTidbitRecord record);
+void tidbit_record_set_ttl (PtrTidbitRecord record, int seconds, int days, int years);
+void tidbit_record_add_element (PtrTidbitRecord record, char* key, char* value);
+char* tidbit_record_get_element_value_by_key (PtrTidbitRecord record, char* key);
+void tidbit_record_sign (PtrTidbitRecord record, PtrTidbitKey key);
+
+void tidbit_database_ref (PtrTidbitDatabase database);
+void tidbit_database_unref (PtrTidbitDatabase database);
+unsigned int tidbit_database_insert_record (PtrTidbitDatabase database, PtrTidbitRecord record);
+PtrTidbitRecord tidbit_database_fetch_record (PtrTidbitDatabase database, PtrTidbitGuid guid);
+PtrTidbitGuidSet tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+
+PtrTidbitDatabase tidbit_database_dbus_new (void);
+PtrTidbitDatabase tidbit_database_mem_new (void);
+PtrTidbitDatabase tidbit_database_http_new (void);
+PtrTidbitDatabase tidbit_database_fork_new (PtrTidbitDatabase sub_a, PtrTidbitDatabase sub_b);
+
+PtrTidbitQuery tidbit_query_new (char* table_name);
+void tidbit_query_ref (PtrTidbitQuery query);
+void tidbit_query_unref (PtrTidbitQuery query);
+void tidbit_query_add_exp (PtrTidbitQuery query, char* key, char* value, TidbitQueryExpType type);
+
+
 #endif