[GNUnet-SVN] r37301 - in gnunet/src: datastore include psycstore

[gnunet]

Author: grothoff
Date: 2016-06-20 10:19:49 +0200 (Mon, 20 Jun 2016)
New Revision: 37301

Modified:
   gnunet/src/datastore/Makefile.am
   gnunet/src/include/gnunet_datastore_plugin.h
   gnunet/src/psycstore/plugin_psycstore_sqlite.c
Log:
use c99

Modified: gnunet/src/datastore/Makefile.am
===================================================================
--- gnunet/src/datastore/Makefile.am    2016-06-20 08:14:56 UTC (rev 37300)
+++ gnunet/src/datastore/Makefile.am    2016-06-20 08:19:49 UTC (rev 37301)
@@ -134,6 +134,7 @@
 libgnunet_plugin_datastore_mysql_la_SOURCES = \
   plugin_datastore_mysql.c
 libgnunet_plugin_datastore_mysql_la_LIBADD = \
+  $(top_builddir)/src/my/libgnunetmy.la \
   $(top_builddir)/src/mysql/libgnunetmysql.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) $(Z_LIBS) -lmysqlclient

Modified: gnunet/src/include/gnunet_datastore_plugin.h
===================================================================
--- gnunet/src/include/gnunet_datastore_plugin.h        2016-06-20 08:14:56 UTC 
(rev 37300)
+++ gnunet/src/include/gnunet_datastore_plugin.h        2016-06-20 08:19:49 UTC 
(rev 37301)
@@ -161,7 +161,8 @@
  * @param cont_cls continuation closure for @a cont
  */
 typedef void
-(*PluginPut) (void *cls, const struct GNUNET_HashCode *key,
+(*PluginPut) (void *cls,
+              const struct GNUNET_HashCode *key,
              uint32_t size,
              const void *data,
              enum GNUNET_BLOCK_Type type,

Modified: gnunet/src/psycstore/plugin_psycstore_sqlite.c
===================================================================
--- gnunet/src/psycstore/plugin_psycstore_sqlite.c      2016-06-20 08:14:56 UTC 
(rev 37300)
+++ gnunet/src/psycstore/plugin_psycstore_sqlite.c      2016-06-20 08:19:49 UTC 
(rev 37301)
@@ -813,13 +813,13 @@
  * @return #GNUNET_OK on success, else #GNUNET_SYSERR
  */
 static int
-membership_store (void *cls,
-                  const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key,
-                  const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
-                  int did_join,
-                  uint64_t announced_at,
-                  uint64_t effective_since,
-                  uint64_t group_generation)
+sqlite_membership_store (void *cls,
+                         const struct GNUNET_CRYPTO_EddsaPublicKey 
*channel_key,
+                         const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
+                         int did_join,
+                         uint64_t announced_at,
+                         uint64_t effective_since,
+                         uint64_t group_generation)
 {
   struct Plugin *plugin = cls;
   sqlite3_stmt *stmt = plugin->insert_membership;
@@ -1898,7 +1898,7 @@
   }
   api = GNUNET_new (struct GNUNET_PSYCSTORE_PluginFunctions);
   api->cls = &plugin;
-  api->membership_store = &membership_store;
+  api->membership_store = &sqlite_membership_store;
   api->membership_test = &membership_test;
   api->fragment_store = &fragment_store;
   api->message_add_flags = &message_add_flags;