diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-06-20 08:19:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-06-20 08:19:49 +0000 |
commit | 1eb83a1ba0adb2d841ee5de2b12005aab5801995 (patch) | |
tree | e537d5d3abae4d7e1bb9b06dd18605f44425c364 | |
parent | 02caa52f2a1f37f3626f4f84632b4afcc75f51c4 (diff) | |
download | gnunet-1eb83a1ba0adb2d841ee5de2b12005aab5801995.tar.gz gnunet-1eb83a1ba0adb2d841ee5de2b12005aab5801995.zip |
use c99
-rw-r--r-- | src/datastore/Makefile.am | 1 | ||||
-rw-r--r-- | src/include/gnunet_datastore_plugin.h | 3 | ||||
-rw-r--r-- | src/psycstore/plugin_psycstore_sqlite.c | 16 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index 9d08c8ac9..1e7619d82 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -134,6 +134,7 @@ libgnunet_plugin_datastore_heap_la_LDFLAGS = \ | |||
134 | libgnunet_plugin_datastore_mysql_la_SOURCES = \ | 134 | libgnunet_plugin_datastore_mysql_la_SOURCES = \ |
135 | plugin_datastore_mysql.c | 135 | plugin_datastore_mysql.c |
136 | libgnunet_plugin_datastore_mysql_la_LIBADD = \ | 136 | libgnunet_plugin_datastore_mysql_la_LIBADD = \ |
137 | $(top_builddir)/src/my/libgnunetmy.la \ | ||
137 | $(top_builddir)/src/mysql/libgnunetmysql.la \ | 138 | $(top_builddir)/src/mysql/libgnunetmysql.la \ |
138 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 139 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
139 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) $(Z_LIBS) -lmysqlclient | 140 | $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) $(Z_LIBS) -lmysqlclient |
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h index 8e30e219c..71c69ffaf 100644 --- a/src/include/gnunet_datastore_plugin.h +++ b/src/include/gnunet_datastore_plugin.h | |||
@@ -161,7 +161,8 @@ typedef void | |||
161 | * @param cont_cls continuation closure for @a cont | 161 | * @param cont_cls continuation closure for @a cont |
162 | */ | 162 | */ |
163 | typedef void | 163 | typedef void |
164 | (*PluginPut) (void *cls, const struct GNUNET_HashCode *key, | 164 | (*PluginPut) (void *cls, |
165 | const struct GNUNET_HashCode *key, | ||
165 | uint32_t size, | 166 | uint32_t size, |
166 | const void *data, | 167 | const void *data, |
167 | enum GNUNET_BLOCK_Type type, | 168 | enum GNUNET_BLOCK_Type type, |
diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c index 7c7b64276..46bdfa1bd 100644 --- a/src/psycstore/plugin_psycstore_sqlite.c +++ b/src/psycstore/plugin_psycstore_sqlite.c | |||
@@ -813,13 +813,13 @@ slave_key_store (struct Plugin *plugin, | |||
813 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 813 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
814 | */ | 814 | */ |
815 | static int | 815 | static int |
816 | membership_store (void *cls, | 816 | sqlite_membership_store (void *cls, |
817 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, | 817 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
818 | const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key, | 818 | const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key, |
819 | int did_join, | 819 | int did_join, |
820 | uint64_t announced_at, | 820 | uint64_t announced_at, |
821 | uint64_t effective_since, | 821 | uint64_t effective_since, |
822 | uint64_t group_generation) | 822 | uint64_t group_generation) |
823 | { | 823 | { |
824 | struct Plugin *plugin = cls; | 824 | struct Plugin *plugin = cls; |
825 | sqlite3_stmt *stmt = plugin->insert_membership; | 825 | sqlite3_stmt *stmt = plugin->insert_membership; |
@@ -1898,7 +1898,7 @@ libgnunet_plugin_psycstore_sqlite_init (void *cls) | |||
1898 | } | 1898 | } |
1899 | api = GNUNET_new (struct GNUNET_PSYCSTORE_PluginFunctions); | 1899 | api = GNUNET_new (struct GNUNET_PSYCSTORE_PluginFunctions); |
1900 | api->cls = &plugin; | 1900 | api->cls = &plugin; |
1901 | api->membership_store = &membership_store; | 1901 | api->membership_store = &sqlite_membership_store; |
1902 | api->membership_test = &membership_test; | 1902 | api->membership_test = &membership_test; |
1903 | api->fragment_store = &fragment_store; | 1903 | api->fragment_store = &fragment_store; |
1904 | api->message_add_flags = &message_add_flags; | 1904 | api->message_add_flags = &message_add_flags; |