diff options
author | Nils Gillmann <ng0@n0.is> | 2018-11-13 11:41:15 +0000 |
---|---|---|
committer | Nils Gillmann <ng0@n0.is> | 2018-11-13 11:41:15 +0000 |
commit | e8a1a082555f98af40f98fd3a20ccd803ad478f8 (patch) | |
tree | b0d10f41e063ad38f087f80e12703b22ee90378c /src | |
parent | c9e6bedfb094fe75dda634938206fc408520717c (diff) | |
download | gnunet-e8a1a082555f98af40f98fd3a20ccd803ad478f8.tar.gz gnunet-e8a1a082555f98af40f98fd3a20ccd803ad478f8.zip |
Partial application of diff send in beberking, Issue #5476
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'src')
-rw-r--r-- | src/cadet/gnunet-service-cadet_paths.c | 6 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnels.c | 2 | ||||
-rw-r--r-- | src/dht/gnunet-dht-get.c | 2 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_clients.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs.c | 2 | ||||
-rw-r--r-- | src/include/gnunet_consensus_service.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_testbed_service.h | 4 | ||||
-rw-r--r-- | src/my/my.c | 2 | ||||
-rw-r--r-- | src/namestore/gnunet-zoneimport.c | 2 | ||||
-rw-r--r-- | src/namestore/namestore_api.c | 2 | ||||
-rw-r--r-- | src/testbed/testbed.h | 2 | ||||
-rw-r--r-- | src/testbed/testbed_api_hosts.c | 2 | ||||
-rw-r--r-- | src/transport/gnunet-transport.c | 2 | ||||
-rw-r--r-- | src/util/configuration.c | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c index 40f464e9b..7769a6043 100644 --- a/src/cadet/gnunet-service-cadet_paths.c +++ b/src/cadet/gnunet-service-cadet_paths.c | |||
@@ -354,7 +354,7 @@ check_match (void *cls, | |||
354 | (off + 1 != cm_ctx->cpath_length) ) | 354 | (off + 1 != cm_ctx->cpath_length) ) |
355 | { | 355 | { |
356 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 356 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
357 | "check_match missmatch because path %s is too long (%u vs. %u vs. %u)\n", | 357 | "check_match mismatch because path %s is too long (%u vs. %u vs. %u)\n", |
358 | GCPP_2s (path), | 358 | GCPP_2s (path), |
359 | path->entries_length, | 359 | path->entries_length, |
360 | off + 1, | 360 | off + 1, |
@@ -367,10 +367,10 @@ check_match (void *cls, | |||
367 | i)) | 367 | i)) |
368 | { | 368 | { |
369 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 369 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
370 | "check_match path %s missmatches at offset %u\n", | 370 | "check_match path %s mismatches at offset %u\n", |
371 | GCPP_2s (path), | 371 | GCPP_2s (path), |
372 | i); | 372 | i); |
373 | return GNUNET_YES; /* missmatch, ignore */ | 373 | return GNUNET_YES; /* mismatch, ignore */ |
374 | } | 374 | } |
375 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 375 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
376 | "check_match found match with path %s\n", | 376 | "check_match found match with path %s\n", |
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 1e7a8e086..874c7e706 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c | |||
@@ -1983,7 +1983,7 @@ GCT_handle_kx_auth (struct CadetTConnection *ct, | |||
1983 | 1, | 1983 | 1, |
1984 | GNUNET_NO); | 1984 | GNUNET_NO); |
1985 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1985 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1986 | "KX AUTH missmatch!\n"); | 1986 | "KX AUTH mismatch!\n"); |
1987 | #if DEBUG_KX | 1987 | #if DEBUG_KX |
1988 | { | 1988 | { |
1989 | struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key; | 1989 | struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key; |
diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index 3742ed739..2d9d76585 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c | |||
@@ -214,7 +214,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
214 | GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key); | 214 | GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key); |
215 | if (verbose) | 215 | if (verbose) |
216 | FPRINTF (stderr, "%s `%s' \n", | 216 | FPRINTF (stderr, "%s `%s' \n", |
217 | _("Issueing DHT GET with key"), | 217 | _("Issuing DHT GET with key"), |
218 | GNUNET_h2s_full (&key)); | 218 | GNUNET_h2s_full (&key)); |
219 | GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL); | 219 | GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL); |
220 | tt = GNUNET_SCHEDULER_add_delayed (timeout_request, | 220 | tt = GNUNET_SCHEDULER_add_delayed (timeout_request, |
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index 862654c83..332bc1eda 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c | |||
@@ -1018,7 +1018,7 @@ forward_reply (void *cls, | |||
1018 | (record->type != frc->type)) | 1018 | (record->type != frc->type)) |
1019 | { | 1019 | { |
1020 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1020 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1021 | "Record type missmatch, not passing request for key %s to local client\n", | 1021 | "Record type mismatch, not passing request for key %s to local client\n", |
1022 | GNUNET_h2s (key)); | 1022 | GNUNET_h2s (key)); |
1023 | GNUNET_STATISTICS_update (GDS_stats, | 1023 | GNUNET_STATISTICS_update (GDS_stats, |
1024 | gettext_noop | 1024 | gettext_noop |
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 594896c93..fea22f279 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -1232,7 +1232,7 @@ peer_init_handler (void *cls, | |||
1232 | my_identity)) | 1232 | my_identity)) |
1233 | { | 1233 | { |
1234 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1234 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1235 | "Peer identity missmatch, refusing to start!\n"); | 1235 | "Peer identity mismatch, refusing to start!\n"); |
1236 | GNUNET_SCHEDULER_shutdown (); | 1236 | GNUNET_SCHEDULER_shutdown (); |
1237 | } | 1237 | } |
1238 | } | 1238 | } |
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h index eee9fc23b..c6aed298c 100644 --- a/src/include/gnunet_consensus_service.h +++ b/src/include/gnunet_consensus_service.h | |||
@@ -53,7 +53,7 @@ extern "C" | |||
53 | 53 | ||
54 | 54 | ||
55 | /** | 55 | /** |
56 | * Called when a new element was received from another peer, or an error occured. | 56 | * Called when a new element was received from another peer, or an error occurred. |
57 | * May deliver duplicate values. | 57 | * May deliver duplicate values. |
58 | * Elements given to a consensus operation by the local peer are NOT given | 58 | * Elements given to a consensus operation by the local peer are NOT given |
59 | * to this callback. | 59 | * to this callback. |
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 4b8d63ad2..302b32019 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h | |||
@@ -443,7 +443,7 @@ typedef void | |||
443 | 443 | ||
444 | 444 | ||
445 | /** | 445 | /** |
446 | * Starts a controller process at the given host. The given host's configration | 446 | * Starts a controller process at the given host. The given host's configuration |
447 | * is used as a Template configuration to use for the remote controller; the | 447 | * is used as a Template configuration to use for the remote controller; the |
448 | * remote controller will be started with a slightly modified configuration | 448 | * remote controller will be started with a slightly modified configuration |
449 | * (port numbers, unix domain sockets and service home values are changed as per | 449 | * (port numbers, unix domain sockets and service home values are changed as per |
@@ -486,7 +486,7 @@ GNUNET_TESTBED_controller_stop (struct GNUNET_TESTBED_ControllerProc *cproc); | |||
486 | 486 | ||
487 | /** | 487 | /** |
488 | * Connect to a controller process. The configuration to use for the connection | 488 | * Connect to a controller process. The configuration to use for the connection |
489 | * is retreived from the given host where a controller is started using | 489 | * is retrieved from the given host where a controller is started using |
490 | * GNUNET_TESTBED_controller_start(). | 490 | * GNUNET_TESTBED_controller_start(). |
491 | * | 491 | * |
492 | * @param host host to run the controller on; This should be the same host if | 492 | * @param host host to run the controller on; This should be the same host if |
diff --git a/src/my/my.c b/src/my/my.c index 2f4cd3ba3..16df437b2 100644 --- a/src/my/my.c +++ b/src/my/my.c | |||
@@ -157,7 +157,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, | |||
157 | if (mysql_stmt_field_count (stmt) != num_fields) | 157 | if (mysql_stmt_field_count (stmt) != num_fields) |
158 | { | 158 | { |
159 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 159 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
160 | "Number of fields missmatch between SQL result and result specification\n"); | 160 | "Number of fields mismatch between SQL result and result specification\n"); |
161 | return GNUNET_SYSERR; | 161 | return GNUNET_SYSERR; |
162 | } | 162 | } |
163 | 163 | ||
diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c index ddc8b483a..01706b777 100644 --- a/src/namestore/gnunet-zoneimport.c +++ b/src/namestore/gnunet-zoneimport.c | |||
@@ -1159,7 +1159,7 @@ process_result (void *cls, | |||
1159 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1159 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1160 | "DNS ID did not match request, ignoring reply\n"); | 1160 | "DNS ID did not match request, ignoring reply\n"); |
1161 | GNUNET_STATISTICS_update (stats, | 1161 | GNUNET_STATISTICS_update (stats, |
1162 | "# DNS ID missmatches", | 1162 | "# DNS ID mismatches", |
1163 | 1, | 1163 | 1, |
1164 | GNUNET_NO); | 1164 | GNUNET_NO); |
1165 | return; | 1165 | return; |
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index 527576718..2cc293b37 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c | |||
@@ -754,7 +754,7 @@ handle_zone_to_name_response (void *cls, | |||
754 | { | 754 | { |
755 | case GNUNET_SYSERR: | 755 | case GNUNET_SYSERR: |
756 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 756 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
757 | "An error occured during zone to name operation\n"); | 757 | "An error occurred during zone to name operation\n"); |
758 | break; | 758 | break; |
759 | case GNUNET_NO: | 759 | case GNUNET_NO: |
760 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 760 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index b6ce7fb09..5b01a8e7f 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h | |||
@@ -101,7 +101,7 @@ struct GNUNET_TESTBED_AddHostMessage | |||
101 | /* followed by non 0-terminated host name */ | 101 | /* followed by non 0-terminated host name */ |
102 | 102 | ||
103 | /* followed by gzip compressed configuration to start or connect to a | 103 | /* followed by gzip compressed configuration to start or connect to a |
104 | controller on this host. While starting the controller this configration | 104 | controller on this host. While starting the controller this configuration |
105 | is used as a template */ | 105 | is used as a template */ |
106 | 106 | ||
107 | }; | 107 | }; |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 2c25eabcf..84296b26a 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -1041,7 +1041,7 @@ helper_exp_cb (void *cls) | |||
1041 | 1041 | ||
1042 | 1042 | ||
1043 | /** | 1043 | /** |
1044 | * Starts a controller process at the given host. The given host's configration | 1044 | * Starts a controller process at the given host. The given host's configuration |
1045 | * is used as a Template configuration to use for the remote controller; the | 1045 | * is used as a Template configuration to use for the remote controller; the |
1046 | * remote controller will be started with a slightly modified configuration | 1046 | * remote controller will be started with a slightly modified configuration |
1047 | * (port numbers, unix domain sockets and service home values are changed as per | 1047 | * (port numbers, unix domain sockets and service home values are changed as per |
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index fed509fe1..6c589307b 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -489,7 +489,7 @@ operation_timeout (void *cls) | |||
489 | } | 489 | } |
490 | FPRINTF (stdout, | 490 | FPRINTF (stdout, |
491 | "%s", | 491 | "%s", |
492 | _("Failed to list connections, timeout occured\n")); | 492 | _("Failed to list connections, timeout occurred\n")); |
493 | GNUNET_SCHEDULER_shutdown (); | 493 | GNUNET_SCHEDULER_shutdown (); |
494 | ret = 1; | 494 | ret = 1; |
495 | return; | 495 | return; |
diff --git a/src/util/configuration.c b/src/util/configuration.c index 41eb3188d..312e0acd3 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c | |||
@@ -522,7 +522,7 @@ GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg, | |||
522 | GNUNET_free (fn); | 522 | GNUNET_free (fn); |
523 | GNUNET_free (cfg_buf); | 523 | GNUNET_free (cfg_buf); |
524 | LOG (GNUNET_ERROR_TYPE_WARNING, | 524 | LOG (GNUNET_ERROR_TYPE_WARNING, |
525 | "Writing configration to file `%s' failed\n", | 525 | "Writing configuration to file `%s' failed\n", |
526 | filename); | 526 | filename); |
527 | cfg->dirty = GNUNET_SYSERR; /* last write failed */ | 527 | cfg->dirty = GNUNET_SYSERR; /* last write failed */ |
528 | return GNUNET_SYSERR; | 528 | return GNUNET_SYSERR; |