From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 20 Jun 2016 08:19:49 +0000 (+0000)
Subject: use c99
X-Git-Tag: initial-import-from-subversion-38251~762
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1eb83a1ba0adb2d841ee5de2b12005aab5801995;p=oweals%2Fgnunet.git

use c99
---

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 = \
 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
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
  * @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,
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,
  * @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 @@ libgnunet_plugin_psycstore_sqlite_init (void *cls)
   }
   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;