aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-01-27 21:46:13 +0100
committerChristian Grothoff <christian@grothoff.org>2017-01-27 21:50:22 +0100
commit0fb9f54b31e618aa2e73d29996bdd7d26b948cda (patch)
tree7053d65586aebaaa9a8e683f9ded8d0354f0a649
parent14848b88f7b0d6f0f35ae8d89304062a96fe03cc (diff)
downloadgnunet-0fb9f54b31e618aa2e73d29996bdd7d26b948cda.tar.gz
gnunet-0fb9f54b31e618aa2e73d29996bdd7d26b948cda.zip
indentation fixes
-rw-r--r--src/cadet/gnunet-service-cadet-new_channel.c1
-rw-r--r--src/cadet/test_cadet.c5
-rw-r--r--src/testbed/testbed_api_test.c18
3 files changed, 13 insertions, 11 deletions
diff --git a/src/cadet/gnunet-service-cadet-new_channel.c b/src/cadet/gnunet-service-cadet-new_channel.c
index f5e310cfc..ef1858c4b 100644
--- a/src/cadet/gnunet-service-cadet-new_channel.c
+++ b/src/cadet/gnunet-service-cadet-new_channel.c
@@ -1,4 +1,3 @@
1
2/* 1/*
3 This file is part of GNUnet. 2 This file is part of GNUnet.
4 Copyright (C) 2001-2017 GNUnet e.V. 3 Copyright (C) 2001-2017 GNUnet e.V.
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index b8587d449..79d9423fd 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -820,8 +820,9 @@ incoming_channel (void *cls,
820 else 820 else
821 { 821 {
822 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 822 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
823 "Incoming channel for unknown client %lu\n", (long) cls); 823 "Incoming channel for unexpected peer #%lu\n",
824 GNUNET_break(0); 824 (long) cls);
825 GNUNET_break (0);
825 } 826 }
826 if (NULL != disconnect_task) 827 if (NULL != disconnect_task)
827 { 828 {
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index e64e9fe2d..559c4abd9 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -114,13 +114,16 @@ run (void *cls, char *const *args, const char *cfgfile,
114 * handle of each peer 114 * handle of each peer
115 * @param cc_cls closure for cc 115 * @param cc_cls closure for cc
116 * @param test_master task to run once the test is ready 116 * @param test_master task to run once the test is ready
117 * @param test_master_cls closure for 'task'. 117 * @param test_master_cls closure for @a test_master
118 * @return GNUNET_SYSERR on error, GNUNET_OK on success 118 * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
119 */ 119 */
120int 120int
121GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename, 121GNUNET_TESTBED_test_run (const char *testname,
122 unsigned int num_peers, uint64_t event_mask, 122 const char *cfg_filename,
123 GNUNET_TESTBED_ControllerCallback cc, void *cc_cls, 123 unsigned int num_peers,
124 uint64_t event_mask,
125 GNUNET_TESTBED_ControllerCallback cc,
126 void *cc_cls,
124 GNUNET_TESTBED_TestMaster test_master, 127 GNUNET_TESTBED_TestMaster test_master,
125 void *test_master_cls) 128 void *test_master_cls)
126{ 129{
@@ -148,9 +151,8 @@ GNUNET_TESTBED_test_run (const char *testname, const char *cfg_filename,
148 rc->event_mask = event_mask; 151 rc->event_mask = event_mask;
149 rc->cc = cc; 152 rc->cc = cc;
150 rc->cc_cls = cc_cls; 153 rc->cc_cls = cc_cls;
151 ret = 154 ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
152 GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, 155 testname, "nohelp", options, &run, rc);
153 testname, "nohelp", options, &run, rc);
154 GNUNET_free (rc); 156 GNUNET_free (rc);
155 GNUNET_free (argv2[0]); 157 GNUNET_free (argv2[0]);
156 GNUNET_free (argv2[2]); 158 GNUNET_free (argv2[2]);