From b2cada934a6811b7fbc2a9d1a9bf84d48a2ba0e1 Mon Sep 17 00:00:00 2001
From: Gabor X Toth <*@tg-x.net>
Date: Wed, 3 Aug 2016 23:20:34 +0000
Subject: [PATCH] multicast,psyc,social: use CORE_connecT()

---
 src/multicast/gnunet-service-multicast.c | 5 ++---
 src/multicast/test_multicast.c           | 9 +++------
 src/psyc/test_psyc.c                     | 5 ++---
 src/social/gnunet-service-social.c       | 5 ++---
 src/social/gnunet-social.c               | 5 ++---
 src/social/test_social.c                 | 5 ++---
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index a14ecd04c..04146a99b 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -333,7 +333,7 @@ shutdown_task (void *cls)
 {
   if (NULL != core)
   {
-    GNUNET_CORE_disconnect (core);
+    GNUNET_CORE_disconnecT (core);
     core = NULL;
   }
   if (NULL != cadet)
@@ -1859,8 +1859,7 @@ run (void *cls,
   cfg = c;
   server = srv;
   GNUNET_SERVER_connect_notify (server, &client_notify_connect, NULL);
-  core = GNUNET_CORE_connect (cfg, NULL, &core_connected_cb, NULL, NULL,
-                              NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);
+  core = GNUNET_CORE_connecT (cfg, NULL, &core_connected_cb, NULL, NULL, NULL);
 }
 
 
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c
index 9b26f9af0..fd8c16670 100644
--- a/src/multicast/test_multicast.c
+++ b/src/multicast/test_multicast.c
@@ -112,7 +112,7 @@ cleanup ()
 {
   if (NULL != core)
   {
-    GNUNET_CORE_disconnect (core);
+    GNUNET_CORE_disconnecT (core);
     core = NULL;
   }
   if (NULL != member)
@@ -713,11 +713,8 @@ run (void *cls,
   cfg = c;
   end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
 						 &end_badly, NULL);
-  core = GNUNET_CORE_connect (cfg, NULL,
-			      &core_connected, NULL, NULL,
-                              NULL, GNUNET_NO,
-			      NULL, GNUNET_NO,
-			      NULL);
+  core = GNUNET_CORE_connecT (cfg, NULL,
+			      &core_connected, NULL, NULL, NULL);
 }
 
 
diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index 7d39d8031..4bcf90fc9 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.c
@@ -145,7 +145,7 @@ cleanup ()
 {
   if (NULL != core)
   {
-    GNUNET_CORE_disconnect (core);
+    GNUNET_CORE_disconnecT (core);
     core = NULL;
   }
   if (NULL != slv)
@@ -988,8 +988,7 @@ run (void *cls,
   GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key);
   GNUNET_CRYPTO_ecdsa_key_get_public (slave_key, &slave_pub_key);
 
-  core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL,
-                              NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);
+  core = GNUNET_CORE_connecT (cfg, NULL, &core_connected, NULL, NULL, NULL);
 }
 
 
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index afcd59b5d..14c457531 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -456,7 +456,7 @@ shutdown_task (void *cls)
   }
   if (NULL != core)
   {
-    GNUNET_CORE_disconnect (core);
+    GNUNET_CORE_disconnecT (core);
     core = NULL;
   }
   if (NULL != id)
@@ -3500,8 +3500,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
   apps_places = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO);
   places_apps = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO);
 
-  core = GNUNET_CORE_connect (cfg, NULL, core_connected, NULL, NULL,
-                              NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);
+  core = GNUNET_CORE_connecT (cfg, NULL, core_connected, NULL, NULL, NULL);
   id = GNUNET_IDENTITY_connect (cfg, &identity_recv_ego, NULL);
   gns = GNUNET_GNS_connect (cfg);
   namestore = GNUNET_NAMESTORE_connect (cfg);
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c
index 39ebff442..98a48c294 100644
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@ -1086,7 +1086,7 @@ app_recv_ego (void *cls,
 static void
 app_connect (void *cls)
 {
-  GNUNET_CORE_disconnect (core);
+  GNUNET_CORE_disconnecT (core);
   core = NULL;
 
   app = GNUNET_SOCIAL_app_connect (cfg, opt_app,
@@ -1181,8 +1181,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
   }
 
-  core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL,
-                              NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);
+  core = GNUNET_CORE_connecT (cfg, NULL, &core_connected, NULL, NULL, NULL);
 }
 
 
diff --git a/src/social/test_social.c b/src/social/test_social.c
index 406f5cb67..71519bf59 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -187,7 +187,7 @@ cleanup ()
 {
   if (NULL != core)
   {
-    GNUNET_CORE_disconnect (core);
+    GNUNET_CORE_disconnecT (core);
     core = NULL;
   }
 
@@ -1332,8 +1332,7 @@ run (void *cls,
   end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
 						 &end_badly, NULL);
 
-  core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL,
-                              NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);
+  core = GNUNET_CORE_connecT (cfg, NULL, &core_connected, NULL, NULL, NULL);
 }
 
 
-- 
2.25.1