diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-04 14:00:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-04 14:00:32 +0000 |
commit | 83b19539f4d322b43683f5838b72e9ec2c8e6073 (patch) | |
tree | d0ab9329fcbefe360d9d14e2ace21a6b3396dfe9 /src/hostlist | |
parent | 28a2eb43281a1f08a67954f07beb9af3a9bc9a35 (diff) | |
download | gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.tar.gz gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.zip |
curly wars / auto-indentation
Diffstat (limited to 'src/hostlist')
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist.c | 4 | ||||
-rw-r--r-- | src/hostlist/hostlist-client.c | 4 | ||||
-rw-r--r-- | src/hostlist/hostlist-server.c | 2 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist.c | 3 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 6 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 3 |
6 files changed, 10 insertions, 12 deletions
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index 2ef807444..b0fb03e29 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c | |||
@@ -143,7 +143,7 @@ static int | |||
143 | advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | 143 | advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer, |
144 | const struct GNUNET_MessageHeader *message, | 144 | const struct GNUNET_MessageHeader *message, |
145 | const struct GNUNET_ATS_Information *atsi, | 145 | const struct GNUNET_ATS_Information *atsi, |
146 | unsigned int atsi_count) | 146 | unsigned int atsi_count) |
147 | { | 147 | { |
148 | GNUNET_assert (NULL != client_adv_handler); | 148 | GNUNET_assert (NULL != client_adv_handler); |
149 | return (*client_adv_handler) (cls, peer, message, atsi, atsi_count); | 149 | return (*client_adv_handler) (cls, peer, message, atsi, atsi_count); |
@@ -161,7 +161,7 @@ advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
161 | static void | 161 | static void |
162 | connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | 162 | connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, |
163 | const struct GNUNET_ATS_Information *atsi, | 163 | const struct GNUNET_ATS_Information *atsi, |
164 | unsigned int atsi_count) | 164 | unsigned int atsi_count) |
165 | { | 165 | { |
166 | if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity))) | 166 | if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity))) |
167 | return; | 167 | return; |
diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c index ba5093779..350a0baee 100644 --- a/src/hostlist/hostlist-client.c +++ b/src/hostlist/hostlist-client.c | |||
@@ -1112,7 +1112,7 @@ task_hostlist_saving (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1112 | static void | 1112 | static void |
1113 | handler_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | 1113 | handler_connect (void *cls, const struct GNUNET_PeerIdentity *peer, |
1114 | const struct GNUNET_ATS_Information *atsi, | 1114 | const struct GNUNET_ATS_Information *atsi, |
1115 | unsigned int atsi_count) | 1115 | unsigned int atsi_count) |
1116 | { | 1116 | { |
1117 | GNUNET_assert (stat_connection_count < UINT_MAX); | 1117 | GNUNET_assert (stat_connection_count < UINT_MAX); |
1118 | stat_connection_count++; | 1118 | stat_connection_count++; |
@@ -1152,7 +1152,7 @@ static int | |||
1152 | handler_advertisement (void *cls, const struct GNUNET_PeerIdentity *peer, | 1152 | handler_advertisement (void *cls, const struct GNUNET_PeerIdentity *peer, |
1153 | const struct GNUNET_MessageHeader *message, | 1153 | const struct GNUNET_MessageHeader *message, |
1154 | const struct GNUNET_ATS_Information *atsi, | 1154 | const struct GNUNET_ATS_Information *atsi, |
1155 | unsigned int atsi_count) | 1155 | unsigned int atsi_count) |
1156 | { | 1156 | { |
1157 | size_t size; | 1157 | size_t size; |
1158 | size_t uri_size; | 1158 | size_t uri_size; |
diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c index a6d9c126c..69d83b4d4 100644 --- a/src/hostlist/hostlist-server.c +++ b/src/hostlist/hostlist-server.c | |||
@@ -367,7 +367,7 @@ adv_transmit_ready (void *cls, size_t size, void *buf) | |||
367 | static void | 367 | static void |
368 | connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | 368 | connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, |
369 | const struct GNUNET_ATS_Information *atsi, | 369 | const struct GNUNET_ATS_Information *atsi, |
370 | unsigned int atsi_count) | 370 | unsigned int atsi_count) |
371 | { | 371 | { |
372 | size_t size; | 372 | size_t size; |
373 | 373 | ||
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index bcb302978..cac2cc67a 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c | |||
@@ -97,8 +97,7 @@ timeout_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
97 | */ | 97 | */ |
98 | static void | 98 | static void |
99 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | 99 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, |
100 | const struct GNUNET_ATS_Information *ats, | 100 | const struct GNUNET_ATS_Information *ats, uint32_t ats_count) |
101 | uint32_t ats_count) | ||
102 | { | 101 | { |
103 | if (peer == NULL) | 102 | if (peer == NULL) |
104 | return; | 103 | return; |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index dfeca8d57..670fecc76 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -299,7 +299,7 @@ static int | |||
299 | ad_arrive_handler (void *cls, const struct GNUNET_PeerIdentity *peer, | 299 | ad_arrive_handler (void *cls, const struct GNUNET_PeerIdentity *peer, |
300 | const struct GNUNET_MessageHeader *message, | 300 | const struct GNUNET_MessageHeader *message, |
301 | const struct GNUNET_ATS_Information *atsi, | 301 | const struct GNUNET_ATS_Information *atsi, |
302 | unsigned int atsi_count) | 302 | unsigned int atsi_count) |
303 | { | 303 | { |
304 | char *hostname; | 304 | char *hostname; |
305 | char *expected_uri; | 305 | char *expected_uri; |
@@ -392,8 +392,8 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname) | |||
392 | GNUNET_free (filename); | 392 | GNUNET_free (filename); |
393 | } | 393 | } |
394 | p->core = | 394 | p->core = |
395 | GNUNET_CORE_connect (p->cfg, 1, NULL, NULL, NULL, NULL, NULL, | 395 | GNUNET_CORE_connect (p->cfg, 1, NULL, NULL, NULL, NULL, NULL, GNUNET_NO, |
396 | GNUNET_NO, NULL, GNUNET_NO, learn_handlers); | 396 | NULL, GNUNET_NO, learn_handlers); |
397 | GNUNET_assert (NULL != p->core); | 397 | GNUNET_assert (NULL != p->core); |
398 | p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg); | 398 | p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg); |
399 | GNUNET_assert (NULL != p->stats); | 399 | GNUNET_assert (NULL != p->stats); |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index 18757a79e..5dce8df10 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | |||
@@ -108,8 +108,7 @@ timeout_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
108 | */ | 108 | */ |
109 | static void | 109 | static void |
110 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, | 110 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer, |
111 | const struct GNUNET_ATS_Information *ats, | 111 | const struct GNUNET_ATS_Information *ats, uint32_t ats_count) |
112 | uint32_t ats_count) | ||
113 | { | 112 | { |
114 | if (peer == NULL) | 113 | if (peer == NULL) |
115 | return; | 114 | return; |