diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-31 13:03:48 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-31 13:03:48 +0100 |
commit | 7e3cf5f461eb4fbb7581672bf0835da07c378136 (patch) | |
tree | bdc3874b7894242b095b892f1ed3e81a4d4f06c0 /src/gns | |
parent | 01b480d6d026e0c537dc284a7e7df2c0320a3528 (diff) | |
download | gnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.tar.gz gnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.zip |
tighten formatting rules
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gns_tld_api.c | 1 | ||||
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 2 | ||||
-rw-r--r-- | src/gns/gnunet-gns-benchmark.c | 1 | ||||
-rw-r--r-- | src/gns/gnunet-gns-import.c | 13 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 9 | ||||
-rw-r--r-- | src/gns/gnunet-gns.c | 3 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_interceptor.c | 1 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 1 | ||||
-rw-r--r-- | src/gns/nss/nss_gns_query.c | 1 | ||||
-rw-r--r-- | src/gns/plugin_block_gns.c | 1 | ||||
-rw-r--r-- | src/gns/plugin_gnsrecord_gns.c | 1 | ||||
-rw-r--r-- | src/gns/plugin_rest_gns.c | 1 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 5 |
13 files changed, 30 insertions, 10 deletions
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c index e646efc3e..e8253ee4c 100644 --- a/src/gns/gns_tld_api.c +++ b/src/gns/gns_tld_api.c | |||
@@ -346,4 +346,5 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr) | |||
346 | return ret; | 346 | return ret; |
347 | } | 347 | } |
348 | 348 | ||
349 | |||
349 | /* end of gns_tld_api.c */ | 350 | /* end of gns_tld_api.c */ |
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index a1ae888dd..81a12de0a 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -103,7 +103,6 @@ static in_addr_t address; | |||
103 | static struct in6_addr address6; | 103 | static struct in6_addr address6; |
104 | 104 | ||
105 | 105 | ||
106 | |||
107 | /** | 106 | /** |
108 | * Handle to GNS resolver. | 107 | * Handle to GNS resolver. |
109 | */ | 108 | */ |
@@ -780,4 +779,5 @@ main (int argc, | |||
780 | return ret; | 779 | return ret; |
781 | } | 780 | } |
782 | 781 | ||
782 | |||
783 | /* end of gnunet-dns2gns.c */ | 783 | /* end of gnunet-dns2gns.c */ |
diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c index d85b9e203..bf13efb11 100644 --- a/src/gns/gnunet-gns-benchmark.c +++ b/src/gns/gnunet-gns-benchmark.c | |||
@@ -614,4 +614,5 @@ main (int argc, | |||
614 | return ret; | 614 | return ret; |
615 | } | 615 | } |
616 | 616 | ||
617 | |||
617 | /* end of gnunet-gns-benchmark.c */ | 618 | /* end of gnunet-gns-benchmark.c */ |
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c index 064294234..0dc04064a 100644 --- a/src/gns/gnunet-gns-import.c +++ b/src/gns/gnunet-gns-import.c | |||
@@ -163,6 +163,7 @@ run_process_and_wait (int pipe_control, | |||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
166 | |||
166 | static void | 167 | static void |
167 | check_pkey (unsigned int rd_len, const struct GNUNET_GNSRECORD_Data *rd, | 168 | check_pkey (unsigned int rd_len, const struct GNUNET_GNSRECORD_Data *rd, |
168 | char *pk, int *found_rec) | 169 | char *pk, int *found_rec) |
@@ -186,6 +187,7 @@ check_pkey (unsigned int rd_len, const struct GNUNET_GNSRECORD_Data *rd, | |||
186 | } | 187 | } |
187 | } | 188 | } |
188 | 189 | ||
190 | |||
189 | /** | 191 | /** |
190 | * Process a record that was stored in the namestore. | 192 | * Process a record that was stored in the namestore. |
191 | * | 193 | * |
@@ -211,6 +213,7 @@ zone_iterator (void *cls, | |||
211 | GNUNET_NAMESTORE_zone_iterator_next (list_it); | 213 | GNUNET_NAMESTORE_zone_iterator_next (list_it); |
212 | } | 214 | } |
213 | 215 | ||
216 | |||
214 | static void | 217 | static void |
215 | zone_iteration_error (void *cls) | 218 | zone_iteration_error (void *cls) |
216 | { | 219 | { |
@@ -322,17 +325,19 @@ get_ego (void *cls, | |||
322 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); | 325 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); |
323 | if (NULL != identifier) | 326 | if (NULL != identifier) |
324 | { | 327 | { |
325 | if ((NULL == master_zone_pkey) &&(0 == strcmp ("master-zone", identifier)) ) | 328 | if ((NULL == master_zone_pkey) && (0 == strcmp ("master-zone", |
329 | identifier)) ) | ||
326 | { | 330 | { |
327 | master_zone_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); | 331 | master_zone_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); |
328 | master_pk = *GNUNET_IDENTITY_ego_get_private_key (ego); | 332 | master_pk = *GNUNET_IDENTITY_ego_get_private_key (ego); |
329 | } | 333 | } |
330 | else if ((NULL == private_zone_pkey) &&(0 == strcmp ("private-zone", | 334 | else if ((NULL == private_zone_pkey) && (0 == strcmp ("private-zone", |
331 | identifier)) ) | 335 | identifier)) ) |
332 | private_zone_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); | 336 | private_zone_pkey = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); |
333 | } | 337 | } |
334 | } | 338 | } |
335 | 339 | ||
340 | |||
336 | /** | 341 | /** |
337 | * Task run on shutdown. | 342 | * Task run on shutdown. |
338 | * | 343 | * |
@@ -362,6 +367,7 @@ shutdown_task (void *cls) | |||
362 | } | 367 | } |
363 | } | 368 | } |
364 | 369 | ||
370 | |||
365 | /** | 371 | /** |
366 | * Main function that will be run. | 372 | * Main function that will be run. |
367 | * | 373 | * |
@@ -484,4 +490,5 @@ main (int argc, char *const *argv) | |||
484 | return GNUNET_OK == r ? ret : 1; | 490 | return GNUNET_OK == r ? ret : 1; |
485 | } | 491 | } |
486 | 492 | ||
493 | |||
487 | /* end of gnunet-gns-import.c */ | 494 | /* end of gnunet-gns-import.c */ |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 2a39efef2..7a5dbb627 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include "gns.h" | 45 | #include "gns.h" |
46 | 46 | ||
47 | 47 | ||
48 | |||
49 | /** | 48 | /** |
50 | * Default Socks5 listen port. | 49 | * Default Socks5 listen port. |
51 | */ | 50 | */ |
@@ -298,7 +297,6 @@ struct Socks5ServerResponseMessage | |||
298 | }; | 297 | }; |
299 | 298 | ||
300 | 299 | ||
301 | |||
302 | /* *********************** Datastructures for HTTP handling ****************** */ | 300 | /* *********************** Datastructures for HTTP handling ****************** */ |
303 | 301 | ||
304 | /** | 302 | /** |
@@ -335,7 +333,6 @@ struct ProxyGNSCertificate | |||
335 | }; | 333 | }; |
336 | 334 | ||
337 | 335 | ||
338 | |||
339 | /** | 336 | /** |
340 | * A structure for all running Httpds | 337 | * A structure for all running Httpds |
341 | */ | 338 | */ |
@@ -652,7 +649,6 @@ struct Socks5Request | |||
652 | }; | 649 | }; |
653 | 650 | ||
654 | 651 | ||
655 | |||
656 | /* *********************** Globals **************************** */ | 652 | /* *********************** Globals **************************** */ |
657 | 653 | ||
658 | /** | 654 | /** |
@@ -1953,8 +1949,7 @@ create_response (void *cls, | |||
1953 | * Pre-populate cache to resolve Hostname. | 1949 | * Pre-populate cache to resolve Hostname. |
1954 | * This is necessary as the DNS name in the CURLOPT_URL is used | 1950 | * This is necessary as the DNS name in the CURLOPT_URL is used |
1955 | * for SNI http://de.wikipedia.org/wiki/Server_Name_Indication | 1951 | * for SNI http://de.wikipedia.org/wiki/Server_Name_Indication |
1956 | */ | 1952 | */if (NULL != s5r->leho) |
1957 | if (NULL != s5r->leho) | ||
1958 | { | 1953 | { |
1959 | char *curl_hosts; | 1954 | char *curl_hosts; |
1960 | 1955 | ||
@@ -2393,6 +2388,7 @@ mhd_connection_cb (void *cls, | |||
2393 | } | 2388 | } |
2394 | } | 2389 | } |
2395 | 2390 | ||
2391 | |||
2396 | /** | 2392 | /** |
2397 | * Function called when MHD first processes an incoming connection. | 2393 | * Function called when MHD first processes an incoming connection. |
2398 | * Gives us the respective URI information. | 2394 | * Gives us the respective URI information. |
@@ -3905,4 +3901,5 @@ main (int argc, | |||
3905 | return ret; | 3901 | return ret; |
3906 | } | 3902 | } |
3907 | 3903 | ||
3904 | |||
3908 | /* end of gnunet-gns-proxy.c */ | 3905 | /* end of gnunet-gns-proxy.c */ |
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index 510e46d14..c3ba0a1f8 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -110,6 +110,7 @@ do_shutdown (void *cls) | |||
110 | } | 110 | } |
111 | } | 111 | } |
112 | 112 | ||
113 | |||
113 | /** | 114 | /** |
114 | * Task to run on timeout | 115 | * Task to run on timeout |
115 | * | 116 | * |
@@ -123,6 +124,7 @@ do_timeout (void*cls) | |||
123 | GNUNET_SCHEDULER_shutdown (); | 124 | GNUNET_SCHEDULER_shutdown (); |
124 | } | 125 | } |
125 | 126 | ||
127 | |||
126 | /** | 128 | /** |
127 | * Function called with the result of a GNS lookup. | 129 | * Function called with the result of a GNS lookup. |
128 | * | 130 | * |
@@ -319,4 +321,5 @@ main (int argc, char *const *argv) | |||
319 | return global_ret; | 321 | return global_ret; |
320 | } | 322 | } |
321 | 323 | ||
324 | |||
322 | /* end of gnunet-gns.c */ | 325 | /* end of gnunet-gns.c */ |
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index d6ee7f91c..a44d36c89 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/gns/gnunet-service-gns_interceptor.c | |||
@@ -409,4 +409,5 @@ GNS_interceptor_done () | |||
409 | } | 409 | } |
410 | } | 410 | } |
411 | 411 | ||
412 | |||
412 | /* end of gnunet-service-gns_interceptor.c */ | 413 | /* end of gnunet-service-gns_interceptor.c */ |
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index d4f174184..01af17fdc 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -536,6 +536,7 @@ is_canonical (const char *name) | |||
536 | return GNUNET_YES; | 536 | return GNUNET_YES; |
537 | } | 537 | } |
538 | 538 | ||
539 | |||
539 | /* ************************** Resolution **************************** */ | 540 | /* ************************** Resolution **************************** */ |
540 | 541 | ||
541 | /** | 542 | /** |
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c index fb431919b..9ebdcb31f 100644 --- a/src/gns/nss/nss_gns_query.c +++ b/src/gns/nss/nss_gns_query.c | |||
@@ -146,4 +146,5 @@ gns_resolve_name (int af, const char *name, struct userdata *u) | |||
146 | return 0; | 146 | return 0; |
147 | } | 147 | } |
148 | 148 | ||
149 | |||
149 | /* end of nss_gns_query.c */ | 150 | /* end of nss_gns_query.c */ |
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index f4f5f906c..aabedcaac 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/gns/plugin_block_gns.c | |||
@@ -246,4 +246,5 @@ libgnunet_plugin_block_gns_done (void *cls) | |||
246 | return NULL; | 246 | return NULL; |
247 | } | 247 | } |
248 | 248 | ||
249 | |||
249 | /* end of plugin_block_gns.c */ | 250 | /* end of plugin_block_gns.c */ |
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c index e0bc4fb0c..cffd5a965 100644 --- a/src/gns/plugin_gnsrecord_gns.c +++ b/src/gns/plugin_gnsrecord_gns.c | |||
@@ -381,4 +381,5 @@ libgnunet_plugin_gnsrecord_gns_done (void *cls) | |||
381 | return NULL; | 381 | return NULL; |
382 | } | 382 | } |
383 | 383 | ||
384 | |||
384 | /* end of plugin_gnsrecord_gns.c */ | 385 | /* end of plugin_gnsrecord_gns.c */ |
diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c index cdcdd6cf8..6ae753a07 100644 --- a/src/gns/plugin_rest_gns.c +++ b/src/gns/plugin_rest_gns.c | |||
@@ -465,4 +465,5 @@ libgnunet_plugin_rest_gns_done (void *cls) | |||
465 | return NULL; | 465 | return NULL; |
466 | } | 466 | } |
467 | 467 | ||
468 | |||
468 | /* end of plugin_rest_gns.c */ | 469 | /* end of plugin_rest_gns.c */ |
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 02a9fc01e..12f3f8625 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -112,6 +112,7 @@ load_file (const char*filename, | |||
112 | return buffer; | 112 | return buffer; |
113 | } | 113 | } |
114 | 114 | ||
115 | |||
115 | /** | 116 | /** |
116 | * Load PEM key from file | 117 | * Load PEM key from file |
117 | * | 118 | * |
@@ -142,6 +143,7 @@ load_key_from_file (gnutls_x509_privkey_t key, | |||
142 | return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK; | 143 | return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK; |
143 | } | 144 | } |
144 | 145 | ||
146 | |||
145 | /** | 147 | /** |
146 | * Load cert from file | 148 | * Load cert from file |
147 | * | 149 | * |
@@ -173,6 +175,7 @@ load_cert_from_file (gnutls_x509_crt_t crt, | |||
173 | return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK; | 175 | return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK; |
174 | } | 176 | } |
175 | 177 | ||
178 | |||
176 | static size_t | 179 | static size_t |
177 | copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx) | 180 | copy_buffer (void *ptr, size_t size, size_t nmemb, void *ctx) |
178 | { | 181 | { |
@@ -521,6 +524,7 @@ run (void *cls, | |||
521 | NULL); | 524 | NULL); |
522 | } | 525 | } |
523 | 526 | ||
527 | |||
524 | int | 528 | int |
525 | main (int argc, char *const *argv) | 529 | main (int argc, char *const *argv) |
526 | { | 530 | { |
@@ -568,4 +572,5 @@ main (int argc, char *const *argv) | |||
568 | return global_ret; | 572 | return global_ret; |
569 | } | 573 | } |
570 | 574 | ||
575 | |||
571 | /* end of test_gns_proxy.c */ | 576 | /* end of test_gns_proxy.c */ |