diff options
Diffstat (limited to 'src/util')
31 files changed, 78 insertions, 78 deletions
diff --git a/src/util/benchmark.c b/src/util/benchmark.c index 497b3cde3..12efde706 100644 --- a/src/util/benchmark.c +++ b/src/util/benchmark.c | |||
@@ -230,7 +230,7 @@ get_benchmark_data (void) | |||
230 | 230 | ||
231 | /** | 231 | /** |
232 | * Get benchmark data for a URL. If the URL is too long, it's truncated | 232 | * Get benchmark data for a URL. If the URL is too long, it's truncated |
233 | * before looking up the correspoding benchmark data. | 233 | * before looking up the corresponding benchmark data. |
234 | * | 234 | * |
235 | * Statistics are bucketed by URL and status code. | 235 | * Statistics are bucketed by URL and status code. |
236 | * | 236 | * |
diff --git a/src/util/bio.c b/src/util/bio.c index 43a2abc89..d221d0a21 100644 --- a/src/util/bio.c +++ b/src/util/bio.c | |||
@@ -138,7 +138,7 @@ GNUNET_BIO_read_open_file (const char *fn) | |||
138 | * | 138 | * |
139 | * @param buffer the buffer to use as source | 139 | * @param buffer the buffer to use as source |
140 | * @param size the total size in bytes of the buffer | 140 | * @param size the total size in bytes of the buffer |
141 | * @return IO handle on sucess, NULL on error | 141 | * @return IO handle on success, NULL on error |
142 | */ | 142 | */ |
143 | struct GNUNET_BIO_ReadHandle * | 143 | struct GNUNET_BIO_ReadHandle * |
144 | GNUNET_BIO_read_open_buffer (void *buffer, size_t size) | 144 | GNUNET_BIO_read_open_buffer (void *buffer, size_t size) |
@@ -644,7 +644,7 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h, char **emsg) | |||
644 | 644 | ||
645 | /** | 645 | /** |
646 | * Force a file-based buffered writer to flush its buffer. | 646 | * Force a file-based buffered writer to flush its buffer. |
647 | * If the handle does not use a file, this function returs #GNUNET_OK | 647 | * If the handle does not use a file, this function returns #GNUNET_OK |
648 | * without doing anything. | 648 | * without doing anything. |
649 | * | 649 | * |
650 | * @param h the IO handle | 650 | * @param h the IO handle |
@@ -1011,7 +1011,7 @@ GNUNET_BIO_read_spec_object (const char *what, | |||
1011 | 1011 | ||
1012 | 1012 | ||
1013 | /** | 1013 | /** |
1014 | * Function used interally to read a string from within a read spec. | 1014 | * Function used internally to read a string from within a read spec. |
1015 | * | 1015 | * |
1016 | * @param cls ignored, always NULL | 1016 | * @param cls ignored, always NULL |
1017 | * @param h the IO handle to read from | 1017 | * @param h the IO handle to read from |
@@ -1110,7 +1110,7 @@ GNUNET_BIO_read_spec_meta_data (const char *what, | |||
1110 | * @param what what is being read (for error message creation) | 1110 | * @param what what is being read (for error message creation) |
1111 | * @param target where to store the data | 1111 | * @param target where to store the data |
1112 | * @param target_size ignored | 1112 | * @param target_size ignored |
1113 | * @retun #GNUNET_OK on success, #GNUNET_SYSERR otherwise | 1113 | * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise |
1114 | */ | 1114 | */ |
1115 | static int | 1115 | static int |
1116 | read_spec_handler_int32 (void *cls, | 1116 | read_spec_handler_int32 (void *cls, |
@@ -1154,7 +1154,7 @@ GNUNET_BIO_read_spec_int32 (const char *what, | |||
1154 | * @param what what is being read (for error message creation) | 1154 | * @param what what is being read (for error message creation) |
1155 | * @param target where to store the data | 1155 | * @param target where to store the data |
1156 | * @param target_size ignored | 1156 | * @param target_size ignored |
1157 | * @retun #GNUNET_OK on success, #GNUNET_SYSERR otherwise | 1157 | * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise |
1158 | */ | 1158 | */ |
1159 | static int | 1159 | static int |
1160 | read_spec_handler_int64 (void *cls, | 1160 | read_spec_handler_int64 (void *cls, |
@@ -1549,7 +1549,7 @@ GNUNET_BIO_write_spec_commit (struct GNUNET_BIO_WriteHandle *h, | |||
1549 | } | 1549 | } |
1550 | 1550 | ||
1551 | /* If it's a file-based handle, the flush makes sure that the data in the | 1551 | /* If it's a file-based handle, the flush makes sure that the data in the |
1552 | buffer is actualy written to the disk. */ | 1552 | buffer is actually written to the disk. */ |
1553 | if (IO_FILE == h->type) | 1553 | if (IO_FILE == h->type) |
1554 | ret = GNUNET_BIO_flush (h); | 1554 | ret = GNUNET_BIO_flush (h); |
1555 | 1555 | ||
diff --git a/src/util/client.c b/src/util/client.c index 2df439175..746c0eb55 100644 --- a/src/util/client.c +++ b/src/util/client.c | |||
@@ -83,7 +83,7 @@ struct AddressProbe | |||
83 | struct ClientState *cstate; | 83 | struct ClientState *cstate; |
84 | 84 | ||
85 | /** | 85 | /** |
86 | * Lenth of addr. | 86 | * Length of addr. |
87 | */ | 87 | */ |
88 | socklen_t addrlen; | 88 | socklen_t addrlen; |
89 | 89 | ||
@@ -1050,7 +1050,7 @@ GNUNET_CLIENT_test (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1050 | 1050 | ||
1051 | /** | 1051 | /** |
1052 | * Create a message queue to connect to a GNUnet service. | 1052 | * Create a message queue to connect to a GNUnet service. |
1053 | * If handlers are specfied, receive messages from the connection. | 1053 | * If handlers are specified, receive messages from the connection. |
1054 | * | 1054 | * |
1055 | * @param cfg our configuration | 1055 | * @param cfg our configuration |
1056 | * @param service_name name of the service to connect to | 1056 | * @param service_name name of the service to connect to |
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index a404a1627..215df55d4 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c | |||
@@ -147,7 +147,7 @@ GNUNET_xnew_array_3d_ (size_t n, | |||
147 | 147 | ||
148 | for (size_t i = 0; i < n; i++) | 148 | for (size_t i = 0; i < n; i++) |
149 | { | 149 | { |
150 | /* need to cast to (char *) temporarily for byte level acuracy */ | 150 | /* need to cast to (char *) temporarily for byte level accuracy */ |
151 | ret[i] = (char **) ((char *) ret /* base address */ | 151 | ret[i] = (char **) ((char *) ret /* base address */ |
152 | + n * sizeof(void **) /* skip 1. dim header */ | 152 | + n * sizeof(void **) /* skip 1. dim header */ |
153 | + i * m * sizeof(void *)); /* skip to 2. dim header */ | 153 | + i * m * sizeof(void *)); /* skip to 2. dim header */ |
diff --git a/src/util/configuration.c b/src/util/configuration.c index 26beacaff..e5c01f81f 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c | |||
@@ -50,7 +50,7 @@ struct ConfigEntry | |||
50 | char *key; | 50 | char *key; |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * current, commited value | 53 | * current, committed value |
54 | */ | 54 | */ |
55 | char *val; | 55 | char *val; |
56 | }; | 56 | }; |
@@ -515,7 +515,7 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
515 | m_size = 0; | 515 | m_size = 0; |
516 | for (sec = cfg->sections; NULL != sec; sec = sec->next) | 516 | for (sec = cfg->sections; NULL != sec; sec = sec->next) |
517 | { | 517 | { |
518 | /* For each section we need to add 3 charaters: {'[',']','\n'} */ | 518 | /* For each section we need to add 3 characters: {'[',']','\n'} */ |
519 | m_size += strlen (sec->name) + 3; | 519 | m_size += strlen (sec->name) + 3; |
520 | for (ent = sec->entries; NULL != ent; ent = ent->next) | 520 | for (ent = sec->entries; NULL != ent; ent = ent->next) |
521 | { | 521 | { |
@@ -1230,7 +1230,7 @@ GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1230 | 1230 | ||
1231 | /** | 1231 | /** |
1232 | * Expand an expression of the form "$FOO/BAR" to "DIRECTORY/BAR" | 1232 | * Expand an expression of the form "$FOO/BAR" to "DIRECTORY/BAR" |
1233 | * where either in the "PATHS" section or the environtment "FOO" is | 1233 | * where either in the "PATHS" section or the environment "FOO" is |
1234 | * set to "DIRECTORY". We also support default expansion, | 1234 | * set to "DIRECTORY". We also support default expansion, |
1235 | * i.e. ${VARIABLE:-default} will expand to $VARIABLE if VARIABLE is | 1235 | * i.e. ${VARIABLE:-default} will expand to $VARIABLE if VARIABLE is |
1236 | * set in PATHS or the environment, and otherwise to "default". Note | 1236 | * set in PATHS or the environment, and otherwise to "default". Note |
@@ -1392,7 +1392,7 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1392 | 1392 | ||
1393 | /** | 1393 | /** |
1394 | * Expand an expression of the form "$FOO/BAR" to "DIRECTORY/BAR" | 1394 | * Expand an expression of the form "$FOO/BAR" to "DIRECTORY/BAR" |
1395 | * where either in the "PATHS" section or the environtment "FOO" is | 1395 | * where either in the "PATHS" section or the environment "FOO" is |
1396 | * set to "DIRECTORY". We also support default expansion, | 1396 | * set to "DIRECTORY". We also support default expansion, |
1397 | * i.e. ${VARIABLE:-default} will expand to $VARIABLE if VARIABLE is | 1397 | * i.e. ${VARIABLE:-default} will expand to $VARIABLE if VARIABLE is |
1398 | * set in PATHS or the environment, and otherwise to "default". Note | 1398 | * set in PATHS or the environment, and otherwise to "default". Note |
diff --git a/src/util/consttime_memcmp.c b/src/util/consttime_memcmp.c index 820ba9835..5dfcb0757 100644 --- a/src/util/consttime_memcmp.c +++ b/src/util/consttime_memcmp.c | |||
@@ -105,7 +105,7 @@ SOFTWARE. | |||
105 | * implementation-defined overflow behaviour is not invoked. | 105 | * implementation-defined overflow behaviour is not invoked. |
106 | * | 106 | * |
107 | * We rely on the C standard's guarantees regarding the wraparound | 107 | * We rely on the C standard's guarantees regarding the wraparound |
108 | * behaviour of unsigned integer arithmetic, and on the analagous | 108 | * behaviour of unsigned integer arithmetic, and on the analogous |
109 | * guarantees regarding conversions from signed types to narrower | 109 | * guarantees regarding conversions from signed types to narrower |
110 | * unsigned types. | 110 | * unsigned types. |
111 | * | 111 | * |
@@ -252,7 +252,7 @@ consttime_memcmp (const void *b1, const void *b2, size_t len) | |||
252 | * instead of int because we need a type that's strictly | 252 | * instead of int because we need a type that's strictly |
253 | * larger than 16 bits, and the C standard allows | 253 | * larger than 16 bits, and the C standard allows |
254 | * implementations where int is only 16 bits. The result | 254 | * implementations where int is only 16 bits. The result |
255 | * from this step will be of type int32_t, and its value wll | 255 | * from this step will be of type int32_t, and its value will |
256 | * be one of 0x00008000 (32768), or in the range 0x00008001 | 256 | * be one of 0x00008000 (32768), or in the range 0x00008001 |
257 | * to 0x000080ff (32769 to 33023), or in the range 0x00007f01 | 257 | * to 0x000080ff (32769 to 33023), or in the range 0x00007f01 |
258 | * to 0x00007fff (32513 to 32767). | 258 | * to 0x00007fff (32513 to 32767). |
diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c index 7da34f1a1..08893d81f 100644 --- a/src/util/container_multihashmap.c +++ b/src/util/container_multihashmap.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Maximum recursion depth for callbacks of | 33 | * Maximum recursion depth for callbacks of |
34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s | 34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s |
35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). | 35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). |
36 | * Should be totally excessive, but if violated we die. | 36 | * Should be totally excessive, but if violated we die. |
37 | */ | 37 | */ |
@@ -184,7 +184,7 @@ struct GNUNET_CONTAINER_MultiHashMapIterator | |||
184 | * to be copied as the destination of the pointer is | 184 | * to be copied as the destination of the pointer is |
185 | * guaranteed to be life as long as the value is stored in | 185 | * guaranteed to be life as long as the value is stored in |
186 | * the hashmap. This can significantly reduce memory | 186 | * the hashmap. This can significantly reduce memory |
187 | * consumption, but of course is also a recipie for | 187 | * consumption, but of course is also a recipe for |
188 | * heap corruption if the assumption is not true. Only | 188 | * heap corruption if the assumption is not true. Only |
189 | * use this if (1) memory use is important in this case and | 189 | * use this if (1) memory use is important in this case and |
190 | * (2) you have triple-checked that the invariant holds | 190 | * (2) you have triple-checked that the invariant holds |
diff --git a/src/util/container_multipeermap.c b/src/util/container_multipeermap.c index 2c0b2090d..94822881d 100644 --- a/src/util/container_multipeermap.c +++ b/src/util/container_multipeermap.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Maximum recursion depth for callbacks of | 33 | * Maximum recursion depth for callbacks of |
34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s | 34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s |
35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). | 35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). |
36 | * Should be totally excessive, but if violated we die. | 36 | * Should be totally excessive, but if violated we die. |
37 | */ | 37 | */ |
@@ -183,7 +183,7 @@ struct GNUNET_CONTAINER_MultiPeerMapIterator | |||
183 | * to be copied as the destination of the pointer is | 183 | * to be copied as the destination of the pointer is |
184 | * guaranteed to be life as long as the value is stored in | 184 | * guaranteed to be life as long as the value is stored in |
185 | * the hashmap. This can significantly reduce memory | 185 | * the hashmap. This can significantly reduce memory |
186 | * consumption, but of course is also a recipie for | 186 | * consumption, but of course is also a recipe for |
187 | * heap corruption if the assumption is not true. Only | 187 | * heap corruption if the assumption is not true. Only |
188 | * use this if (1) memory use is important in this case and | 188 | * use this if (1) memory use is important in this case and |
189 | * (2) you have triple-checked that the invariant holds | 189 | * (2) you have triple-checked that the invariant holds |
diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c index 86ab31107..77e5ca139 100644 --- a/src/util/container_multishortmap.c +++ b/src/util/container_multishortmap.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Maximum recursion depth for callbacks of | 33 | * Maximum recursion depth for callbacks of |
34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s | 34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s |
35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). | 35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). |
36 | * Should be totally excessive, but if violated we die. | 36 | * Should be totally excessive, but if violated we die. |
37 | */ | 37 | */ |
@@ -184,7 +184,7 @@ struct GNUNET_CONTAINER_MultiShortmapIterator | |||
184 | * to be copied as the destination of the pointer is | 184 | * to be copied as the destination of the pointer is |
185 | * guaranteed to be life as long as the value is stored in | 185 | * guaranteed to be life as long as the value is stored in |
186 | * the hashmap. This can significantly reduce memory | 186 | * the hashmap. This can significantly reduce memory |
187 | * consumption, but of course is also a recipie for | 187 | * consumption, but of course is also a recipe for |
188 | * heap corruption if the assumption is not true. Only | 188 | * heap corruption if the assumption is not true. Only |
189 | * use this if (1) memory use is important in this case and | 189 | * use this if (1) memory use is important in this case and |
190 | * (2) you have triple-checked that the invariant holds | 190 | * (2) you have triple-checked that the invariant holds |
diff --git a/src/util/container_multiuuidmap.c b/src/util/container_multiuuidmap.c index 5e896aec2..f2ed304b3 100644 --- a/src/util/container_multiuuidmap.c +++ b/src/util/container_multiuuidmap.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Maximum recursion depth for callbacks of | 33 | * Maximum recursion depth for callbacks of |
34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s | 34 | * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s |
35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). | 35 | * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). |
36 | * Should be totally excessive, but if violated we die. | 36 | * Should be totally excessive, but if violated we die. |
37 | */ | 37 | */ |
@@ -184,7 +184,7 @@ struct GNUNET_CONTAINER_MultiUuidmapIterator | |||
184 | * to be copied as the destination of the pointer is | 184 | * to be copied as the destination of the pointer is |
185 | * guaranteed to be life as long as the value is stored in | 185 | * guaranteed to be life as long as the value is stored in |
186 | * the hashmap. This can significantly reduce memory | 186 | * the hashmap. This can significantly reduce memory |
187 | * consumption, but of course is also a recipie for | 187 | * consumption, but of course is also a recipe for |
188 | * heap corruption if the assumption is not true. Only | 188 | * heap corruption if the assumption is not true. Only |
189 | * use this if (1) memory use is important in this case and | 189 | * use this if (1) memory use is important in this case and |
190 | * (2) you have triple-checked that the invariant holds | 190 | * (2) you have triple-checked that the invariant holds |
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c index 5b01d5efe..804d3eba8 100644 --- a/src/util/crypto_crc.c +++ b/src/util/crypto_crc.c | |||
@@ -137,7 +137,7 @@ GNUNET_CRYPTO_crc16_step (uint32_t sum, const void *buf, size_t len) | |||
137 | /** | 137 | /** |
138 | * Convert results from #GNUNET_CRYPTO_crc16_step() to final crc16. | 138 | * Convert results from #GNUNET_CRYPTO_crc16_step() to final crc16. |
139 | * | 139 | * |
140 | * @param sum cummulative sum | 140 | * @param sum cumulative sum |
141 | * @return crc16 value | 141 | * @return crc16 value |
142 | */ | 142 | */ |
143 | uint16_t | 143 | uint16_t |
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c index 94b6f5099..55676917e 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c | |||
@@ -61,7 +61,7 @@ GNUNET_CRYPTO_hash (const void *block, | |||
61 | /** | 61 | /** |
62 | * Convert GNUNET_CRYPTO_hash to ASCII encoding. The ASCII encoding is rather | 62 | * Convert GNUNET_CRYPTO_hash to ASCII encoding. The ASCII encoding is rather |
63 | * GNUnet specific. It was chosen such that it only uses characters | 63 | * GNUnet specific. It was chosen such that it only uses characters |
64 | * in [0-9A-V], can be produced without complex arithmetics and uses a | 64 | * in [0-9A-V], can be produced without complex arithmetic and uses a |
65 | * small number of characters. The GNUnet encoding uses 103 | 65 | * small number of characters. The GNUnet encoding uses 103 |
66 | * characters plus a null terminator. | 66 | * characters plus a null terminator. |
67 | * | 67 | * |
@@ -463,7 +463,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key, | |||
463 | 463 | ||
464 | 464 | ||
465 | /** | 465 | /** |
466 | * Context for cummulative hashing. | 466 | * Context for cumulative hashing. |
467 | */ | 467 | */ |
468 | struct GNUNET_HashContext | 468 | struct GNUNET_HashContext |
469 | { | 469 | { |
@@ -501,7 +501,7 @@ GNUNET_CRYPTO_hash_context_start () | |||
501 | /** | 501 | /** |
502 | * Add data to be hashed. | 502 | * Add data to be hashed. |
503 | * | 503 | * |
504 | * @param hc cummulative hash context | 504 | * @param hc cumulative hash context |
505 | * @param buf data to add | 505 | * @param buf data to add |
506 | * @param size number of bytes in @a buf | 506 | * @param size number of bytes in @a buf |
507 | */ | 507 | */ |
diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c index e070918d3..8e46d71fd 100644 --- a/src/util/crypto_hash_file.c +++ b/src/util/crypto_hash_file.c | |||
@@ -172,7 +172,7 @@ file_hash_task (void *cls) | |||
172 | * @param blocksize number of bytes to process in one task | 172 | * @param blocksize number of bytes to process in one task |
173 | * @param callback function to call upon completion | 173 | * @param callback function to call upon completion |
174 | * @param callback_cls closure for @a callback | 174 | * @param callback_cls closure for @a callback |
175 | * @return NULL on (immediate) errror | 175 | * @return NULL on (immediate) error |
176 | */ | 176 | */ |
177 | struct GNUNET_CRYPTO_FileHashContext * | 177 | struct GNUNET_CRYPTO_FileHashContext * |
178 | GNUNET_CRYPTO_hash_file (enum GNUNET_SCHEDULER_Priority priority, | 178 | GNUNET_CRYPTO_hash_file (enum GNUNET_SCHEDULER_Priority priority, |
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 4f3830308..0dc734549 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c | |||
@@ -159,7 +159,7 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r, | |||
159 | (const unsigned char *) buf, | 159 | (const unsigned char *) buf, |
160 | sizeof(buf), | 160 | sizeof(buf), |
161 | &rsize); | 161 | &rsize); |
162 | GNUNET_assert (0 == rc); /* Allocation erro? */ | 162 | GNUNET_assert (0 == rc); /* Allocation error? */ |
163 | 163 | ||
164 | gcry_mpi_clear_highbit (*r, nbits); | 164 | gcry_mpi_clear_highbit (*r, nbits); |
165 | GNUNET_assert (0 == gcry_mpi_test_bit (*r, nbits)); | 165 | GNUNET_assert (0 == gcry_mpi_test_bit (*r, nbits)); |
diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c index 0a08509ba..97dfad630 100644 --- a/src/util/crypto_paillier.c +++ b/src/util/crypto_paillier.c | |||
@@ -111,7 +111,7 @@ GNUNET_CRYPTO_paillier_create (struct | |||
111 | * @param public_key Public key to use. | 111 | * @param public_key Public key to use. |
112 | * @param m Plaintext to encrypt. | 112 | * @param m Plaintext to encrypt. |
113 | * @param desired_ops How many homomorphic ops the caller intends to use | 113 | * @param desired_ops How many homomorphic ops the caller intends to use |
114 | * @param[out] ciphertext Encrytion of @a plaintext with @a public_key. | 114 | * @param[out] ciphertext Encryption of @a plaintext with @a public_key. |
115 | * @return guaranteed number of supported homomorphic operations >= 1, | 115 | * @return guaranteed number of supported homomorphic operations >= 1, |
116 | * or desired_ops, in case that is lower, | 116 | * or desired_ops, in case that is lower, |
117 | * or -1 if less than one homomorphic operation is possible | 117 | * or -1 if less than one homomorphic operation is possible |
@@ -211,7 +211,7 @@ GNUNET_CRYPTO_paillier_encrypt1 (const struct | |||
211 | * @param public_key Public key to use. | 211 | * @param public_key Public key to use. |
212 | * @param m Plaintext to encrypt. | 212 | * @param m Plaintext to encrypt. |
213 | * @param desired_ops How many homomorphic ops the caller intends to use | 213 | * @param desired_ops How many homomorphic ops the caller intends to use |
214 | * @param[out] ciphertext Encrytion of @a plaintext with @a public_key. | 214 | * @param[out] ciphertext Encryption of @a plaintext with @a public_key. |
215 | * @return guaranteed number of supported homomorphic operations >= 1, | 215 | * @return guaranteed number of supported homomorphic operations >= 1, |
216 | * or desired_ops, in case that is lower, | 216 | * or desired_ops, in case that is lower, |
217 | * or -1 if less than one homomorphic operation is possible | 217 | * or -1 if less than one homomorphic operation is possible |
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c index b12ec7434..d5eca6225 100644 --- a/src/util/crypto_rsa.c +++ b/src/util/crypto_rsa.c | |||
@@ -259,7 +259,7 @@ GNUNET_CRYPTO_rsa_private_key_decode (const void *buf, | |||
259 | * Extract the public key of the given private key. | 259 | * Extract the public key of the given private key. |
260 | * | 260 | * |
261 | * @param priv the private key | 261 | * @param priv the private key |
262 | * @retur NULL on error, otherwise the public key | 262 | * @return NULL on error, otherwise the public key |
263 | */ | 263 | */ |
264 | struct GNUNET_CRYPTO_RsaPublicKey * | 264 | struct GNUNET_CRYPTO_RsaPublicKey * |
265 | GNUNET_CRYPTO_rsa_private_key_get_public (const struct | 265 | GNUNET_CRYPTO_rsa_private_key_get_public (const struct |
@@ -541,7 +541,7 @@ static struct RsaBlindingKey * | |||
541 | rsa_blinding_key_derive (const struct GNUNET_CRYPTO_RsaPublicKey *pkey, | 541 | rsa_blinding_key_derive (const struct GNUNET_CRYPTO_RsaPublicKey *pkey, |
542 | const struct GNUNET_CRYPTO_RsaBlindingKeySecret *bks) | 542 | const struct GNUNET_CRYPTO_RsaBlindingKeySecret *bks) |
543 | { | 543 | { |
544 | char *xts = "Blinding KDF extrator HMAC key"; /* Trusts bks' randomness more */ | 544 | char *xts = "Blinding KDF extractor HMAC key"; /* Trusts bks' randomness more */ |
545 | struct RsaBlindingKey *blind; | 545 | struct RsaBlindingKey *blind; |
546 | gcry_mpi_t n; | 546 | gcry_mpi_t n; |
547 | 547 | ||
@@ -570,7 +570,7 @@ rsa_blinding_key_derive (const struct GNUNET_CRYPTO_RsaPublicKey *pkey, | |||
570 | 570 | ||
571 | 571 | ||
572 | /* | 572 | /* |
573 | We originally added GNUNET_CRYPTO_kdf_mod_mpi for the benifit of the | 573 | We originally added GNUNET_CRYPTO_kdf_mod_mpi for the benefit of the |
574 | previous routine. | 574 | previous routine. |
575 | 575 | ||
576 | There was previously a call to GNUNET_CRYPTO_kdf in | 576 | There was previously a call to GNUNET_CRYPTO_kdf in |
@@ -1055,7 +1055,7 @@ GNUNET_CRYPTO_rsa_sign_fdh (const struct GNUNET_CRYPTO_RsaPrivateKey *key, | |||
1055 | /** | 1055 | /** |
1056 | * Free memory occupied by signature. | 1056 | * Free memory occupied by signature. |
1057 | * | 1057 | * |
1058 | * @param sig memory to freee | 1058 | * @param sig memory to free |
1059 | */ | 1059 | */ |
1060 | void | 1060 | void |
1061 | GNUNET_CRYPTO_rsa_signature_free (struct GNUNET_CRYPTO_RsaSignature *sig) | 1061 | GNUNET_CRYPTO_rsa_signature_free (struct GNUNET_CRYPTO_RsaSignature *sig) |
diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c index 8a6c7fbe9..d8e6a1f0d 100644 --- a/src/util/gnunet-resolver.c +++ b/src/util/gnunet-resolver.c | |||
@@ -179,7 +179,7 @@ main (int argc, char *const *argv) | |||
179 | ret = (GNUNET_OK == | 179 | ret = (GNUNET_OK == |
180 | GNUNET_PROGRAM_run (argc, argv, | 180 | GNUNET_PROGRAM_run (argc, argv, |
181 | "gnunet-resolver [hostname]", | 181 | "gnunet-resolver [hostname]", |
182 | gettext_noop ("Use build-in GNUnet stub resolver"), | 182 | gettext_noop ("Use built-in GNUnet stub resolver"), |
183 | options, | 183 | options, |
184 | &run, NULL)) ? 0 : 1; | 184 | &run, NULL)) ? 0 : 1; |
185 | GNUNET_free_nz ((void *) argv); | 185 | GNUNET_free_nz ((void *) argv); |
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c index 5ed70807e..9bde04117 100644 --- a/src/util/gnunet-service-resolver.c +++ b/src/util/gnunet-service-resolver.c | |||
@@ -1223,7 +1223,7 @@ load_etc_hosts (void) | |||
1223 | if (GNUNET_OK != GNUNET_DISK_file_handle_size (fh, &bytes_read)) | 1223 | if (GNUNET_OK != GNUNET_DISK_file_handle_size (fh, &bytes_read)) |
1224 | { | 1224 | { |
1225 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1225 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1226 | "Could not determin size of /etc/hosts. " | 1226 | "Could not determine size of /etc/hosts. " |
1227 | "DNS resolution will not be possible.\n"); | 1227 | "DNS resolution will not be possible.\n"); |
1228 | GNUNET_DISK_file_close (fh); | 1228 | GNUNET_DISK_file_close (fh); |
1229 | return; | 1229 | return; |
diff --git a/src/util/helper.c b/src/util/helper.c index 7360b7d4b..dcb55d8c7 100644 --- a/src/util/helper.c +++ b/src/util/helper.c | |||
@@ -103,7 +103,7 @@ struct GNUNET_HELPER_Handle | |||
103 | struct GNUNET_OS_Process *helper_proc; | 103 | struct GNUNET_OS_Process *helper_proc; |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * The Message-Tokenizer that tokenizes the messages comming from the helper | 106 | * The Message-Tokenizer that tokenizes the messages coming from the helper |
107 | */ | 107 | */ |
108 | struct GNUNET_MessageStreamTokenizer *mst; | 108 | struct GNUNET_MessageStreamTokenizer *mst; |
109 | 109 | ||
@@ -646,7 +646,7 @@ helper_write (void *cls) | |||
646 | * @param h helper to send message to | 646 | * @param h helper to send message to |
647 | * @param msg message to send | 647 | * @param msg message to send |
648 | * @param can_drop can the message be dropped if there is already one in the queue? | 648 | * @param can_drop can the message be dropped if there is already one in the queue? |
649 | * @param cont continuation to run once the message is out (#GNUNET_OK on succees, #GNUNET_NO | 649 | * @param cont continuation to run once the message is out (#GNUNET_OK on success, #GNUNET_NO |
650 | * if the helper process died, #GNUNET_SYSERR during #GNUNET_HELPER_destroy). | 650 | * if the helper process died, #GNUNET_SYSERR during #GNUNET_HELPER_destroy). |
651 | * @param cont_cls closure for @a cont | 651 | * @param cont_cls closure for @a cont |
652 | * @return NULL if the message was dropped, | 652 | * @return NULL if the message was dropped, |
diff --git a/src/util/load.c b/src/util/load.c index cfbfa36d6..64f0b19c1 100644 --- a/src/util/load.c +++ b/src/util/load.c | |||
@@ -59,14 +59,14 @@ struct GNUNET_LOAD_Value | |||
59 | uint64_t cummulative_squared_delay; | 59 | uint64_t cummulative_squared_delay; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * Total number of requests included in the cummulative datastore delay values. | 62 | * Total number of requests included in the cumulative datastore delay values. |
63 | */ | 63 | */ |
64 | uint64_t cummulative_request_count; | 64 | uint64_t cummulative_request_count; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * Current running average datastore delay. Its relation to the | 67 | * Current running average datastore delay. Its relation to the |
68 | * average datastore delay and it std. dev. (as calcualted from the | 68 | * average datastore delay and it std. dev. (as calculated from the |
69 | * cummulative values) tells us our current load. | 69 | * cumulative values) tells us our current load. |
70 | */ | 70 | */ |
71 | double runavg_delay; | 71 | double runavg_delay; |
72 | 72 | ||
@@ -163,7 +163,7 @@ calculate_load (struct GNUNET_LOAD_Value *load) | |||
163 | 163 | ||
164 | if (load->cummulative_request_count <= 1) | 164 | if (load->cummulative_request_count <= 1) |
165 | return; | 165 | return; |
166 | /* calcuate std dev of latency; we have for n values of "i" that: | 166 | /* calculate std dev of latency; we have for n values of "i" that: |
167 | * | 167 | * |
168 | * avg = (sum val_i) / n | 168 | * avg = (sum val_i) / n |
169 | * stddev = (sum (val_i - avg)^2) / (n-1) | 169 | * stddev = (sum (val_i - avg)^2) / (n-1) |
diff --git a/src/util/mq.c b/src/util/mq.c index 29ead02a4..2342b2c5c 100644 --- a/src/util/mq.c +++ b/src/util/mq.c | |||
@@ -192,7 +192,7 @@ struct GNUNET_MQ_Handle | |||
192 | * Call the message message handler that was registered | 192 | * Call the message message handler that was registered |
193 | * for the type of the given message in the given message queue. | 193 | * for the type of the given message in the given message queue. |
194 | * | 194 | * |
195 | * This function is indended to be used for the implementation | 195 | * This function is intended to be used for the implementation |
196 | * of message queues. | 196 | * of message queues. |
197 | * | 197 | * |
198 | * @param mq message queue with the handlers | 198 | * @param mq message queue with the handlers |
@@ -217,7 +217,7 @@ GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq, | |||
217 | * Call the message message handler that was registered | 217 | * Call the message message handler that was registered |
218 | * for the type of the given message in the given @a handlers list. | 218 | * for the type of the given message in the given @a handlers list. |
219 | * | 219 | * |
220 | * This function is indended to be used for the implementation | 220 | * This function is intended to be used for the implementation |
221 | * of message queues. | 221 | * of message queues. |
222 | * | 222 | * |
223 | * @param handlers a set of handlers | 223 | * @param handlers a set of handlers |
@@ -1220,7 +1220,7 @@ GNUNET_MQ_dll_remove (struct GNUNET_MQ_Envelope **env_head, | |||
1220 | /** | 1220 | /** |
1221 | * Copy an array of handlers. | 1221 | * Copy an array of handlers. |
1222 | * | 1222 | * |
1223 | * Useful if the array has been delared in local memory and needs to be | 1223 | * Useful if the array has been declared in local memory and needs to be |
1224 | * persisted for future use. | 1224 | * persisted for future use. |
1225 | * | 1225 | * |
1226 | * @param handlers Array of handlers to be copied. Can be NULL (nothing done). | 1226 | * @param handlers Array of handlers to be copied. Can be NULL (nothing done). |
@@ -1248,7 +1248,7 @@ GNUNET_MQ_copy_handlers (const struct GNUNET_MQ_MessageHandler *handlers) | |||
1248 | /** | 1248 | /** |
1249 | * Copy an array of handlers, appending AGPL handler. | 1249 | * Copy an array of handlers, appending AGPL handler. |
1250 | * | 1250 | * |
1251 | * Useful if the array has been delared in local memory and needs to be | 1251 | * Useful if the array has been declared in local memory and needs to be |
1252 | * persisted for future use. | 1252 | * persisted for future use. |
1253 | * | 1253 | * |
1254 | * @param handlers Array of handlers to be copied. Can be NULL (nothing done). | 1254 | * @param handlers Array of handlers to be copied. Can be NULL (nothing done). |
diff --git a/src/util/mst.c b/src/util/mst.c index 7fe93c55c..13835ffd0 100644 --- a/src/util/mst.c +++ b/src/util/mst.c | |||
@@ -295,7 +295,7 @@ do_align: | |||
295 | else | 295 | else |
296 | { | 296 | { |
297 | /* need to copy to private buffer to align; | 297 | /* need to copy to private buffer to align; |
298 | * yes, we go a bit more spagetti than usual here */ | 298 | * yes, we go a bit more spaghetti than usual here */ |
299 | goto do_align; | 299 | goto do_align; |
300 | } | 300 | } |
301 | } | 301 | } |
diff --git a/src/util/os_installation.c b/src/util/os_installation.c index 1f2dd2e5b..6e783a95a 100644 --- a/src/util/os_installation.c +++ b/src/util/os_installation.c | |||
@@ -80,7 +80,7 @@ static const struct GNUNET_OS_ProjectData default_pd = { | |||
80 | static const struct GNUNET_OS_ProjectData *current_pd = &default_pd; | 80 | static const struct GNUNET_OS_ProjectData *current_pd = &default_pd; |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * Wether or not gettext has been initialized for the library. | 83 | * Whether or not gettext has been initialized for the library. |
84 | * Note that the gettext initialization done within | 84 | * Note that the gettext initialization done within |
85 | * GNUNET_PROGRAM_run2 is for the specific application. | 85 | * GNUNET_PROGRAM_run2 is for the specific application. |
86 | */ | 86 | */ |
@@ -374,7 +374,7 @@ get_path_from_GNUNET_PREFIX () | |||
374 | 374 | ||
375 | 375 | ||
376 | /** | 376 | /** |
377 | * @brief get the path to GNUnet bin/ or lib/, prefering the lib/ path | 377 | * @brief get the path to GNUnet bin/ or lib/, preferring the lib/ path |
378 | * @author Milan | 378 | * @author Milan |
379 | * | 379 | * |
380 | * @return a pointer to the executable path, or NULL on error | 380 | * @return a pointer to the executable path, or NULL on error |
diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 8d045c72b..1ed9bcbf7 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c | |||
@@ -563,7 +563,7 @@ start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance, | |||
563 | if (lscp[i] != tgt) | 563 | if (lscp[i] != tgt) |
564 | { | 564 | { |
565 | /* Bury any existing FD, no matter what; they should all be closed | 565 | /* Bury any existing FD, no matter what; they should all be closed |
566 | * on exec anyway and the important onces have been dup'ed away */ | 566 | * on exec anyway and the important ones have been dup'ed away */ |
567 | (void) close (tgt); | 567 | (void) close (tgt); |
568 | GNUNET_assert (-1 != dup2 (lscp[i], tgt)); | 568 | GNUNET_assert (-1 != dup2 (lscp[i], tgt)); |
569 | } | 569 | } |
diff --git a/src/util/scheduler.c b/src/util/scheduler.c index b5ce20254..759312df5 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c | |||
@@ -122,7 +122,7 @@ struct GNUNET_SCHEDULER_Handle | |||
122 | struct GNUNET_SIGNAL_Context *shc_hup; | 122 | struct GNUNET_SIGNAL_Context *shc_hup; |
123 | 123 | ||
124 | /** | 124 | /** |
125 | * context of hte SIGPIPE handler | 125 | * context of the SIGPIPE handler |
126 | */ | 126 | */ |
127 | struct GNUNET_SIGNAL_Context *shc_pipe; | 127 | struct GNUNET_SIGNAL_Context *shc_pipe; |
128 | }; | 128 | }; |
diff --git a/src/util/socks.c b/src/util/socks.c index 7ab297272..5c9f8a5f8 100644 --- a/src/util/socks.c +++ b/src/util/socks.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #define SOCKS5_AUTH_MAF 0x08 /* Multi-Authentication Framework */ | 45 | #define SOCKS5_AUTH_MAF 0x08 /* Multi-Authentication Framework */ |
46 | 46 | ||
47 | 47 | ||
48 | /* SOCKS5 connection responces */ | 48 | /* SOCKS5 connection responses */ |
49 | #define SOCKS5_REP_SUCCEEDED 0x00 /* succeeded */ | 49 | #define SOCKS5_REP_SUCCEEDED 0x00 /* succeeded */ |
50 | #define SOCKS5_REP_FAIL 0x01 /* general SOCKS serer failure */ | 50 | #define SOCKS5_REP_FAIL 0x01 /* general SOCKS serer failure */ |
51 | #define SOCKS5_REP_NALLOWED 0x02 /* connection not allowed by ruleset */ | 51 | #define SOCKS5_REP_NALLOWED 0x02 /* connection not allowed by ruleset */ |
@@ -55,7 +55,7 @@ | |||
55 | #define SOCKS5_REP_EXPIRED 0x06 /* TTL expired */ | 55 | #define SOCKS5_REP_EXPIRED 0x06 /* TTL expired */ |
56 | #define SOCKS5_REP_CNOTSUP 0x07 /* Command not supported */ | 56 | #define SOCKS5_REP_CNOTSUP 0x07 /* Command not supported */ |
57 | #define SOCKS5_REP_ANOTSUP 0x08 /* Address not supported */ | 57 | #define SOCKS5_REP_ANOTSUP 0x08 /* Address not supported */ |
58 | #define SOCKS5_REP_INVADDR 0x09 /* Inalid address */ | 58 | #define SOCKS5_REP_INVADDR 0x09 /* Invalid address */ |
59 | 59 | ||
60 | const char * | 60 | const char * |
61 | SOCKS5_REP_names (int rep) | 61 | SOCKS5_REP_names (int rep) |
@@ -155,12 +155,12 @@ struct GNUNET_SOCKS_Handshake | |||
155 | int step; | 155 | int step; |
156 | 156 | ||
157 | /** | 157 | /** |
158 | * Precomputed SOCKS5 handshake ouput buffer | 158 | * Precomputed SOCKS5 handshake output buffer |
159 | */ | 159 | */ |
160 | unsigned char outbuf[1024]; | 160 | unsigned char outbuf[1024]; |
161 | 161 | ||
162 | /** | 162 | /** |
163 | * Pointers delineating protoocol steps in the outbut buffer | 163 | * Pointers delineating protoocol steps in the output buffer |
164 | */ | 164 | */ |
165 | unsigned char *(outstep[4]); | 165 | unsigned char *(outstep[4]); |
166 | 166 | ||
@@ -177,7 +177,7 @@ struct GNUNET_SOCKS_Handshake | |||
177 | }; | 177 | }; |
178 | 178 | ||
179 | 179 | ||
180 | /* Regitering prototypes */ | 180 | /* Registering prototypes */ |
181 | 181 | ||
182 | void | 182 | void |
183 | register_reciever (struct GNUNET_SOCKS_Handshake *ih, int want); | 183 | register_reciever (struct GNUNET_SOCKS_Handshake *ih, int want); |
@@ -255,7 +255,7 @@ SOCKS5_handshake_step (struct GNUNET_SOCKS_Handshake *ih) | |||
255 | b += 2; | 255 | b += 2; |
256 | break; | 256 | break; |
257 | 257 | ||
258 | case SOCKS5_step_auth: /* SOCKS5 server's responce to authentication */ | 258 | case SOCKS5_step_auth: /* SOCKS5 server's response to authentication */ |
259 | if (b[1] != 0) | 259 | if (b[1] != 0) |
260 | { | 260 | { |
261 | LOG (GNUNET_ERROR_TYPE_ERROR, "SOCKS5 authentication failed\n"); | 261 | LOG (GNUNET_ERROR_TYPE_ERROR, "SOCKS5 authentication failed\n"); |
@@ -265,7 +265,7 @@ SOCKS5_handshake_step (struct GNUNET_SOCKS_Handshake *ih) | |||
265 | b += 2; | 265 | b += 2; |
266 | break; | 266 | break; |
267 | 267 | ||
268 | case SOCKS5_step_cmd: /* SOCKS5 server's responce to command */ | 268 | case SOCKS5_step_cmd: /* SOCKS5 server's response to command */ |
269 | if (b[0] != 5) | 269 | if (b[0] != 5) |
270 | { | 270 | { |
271 | LOG (GNUNET_ERROR_TYPE_ERROR, "SOCKS5 protocol error\n"); | 271 | LOG (GNUNET_ERROR_TYPE_ERROR, "SOCKS5 protocol error\n"); |
@@ -326,7 +326,7 @@ SOCKS5_handshake_step (struct GNUNET_SOCKS_Handshake *ih) | |||
326 | * @param handler_cls closure for @a handler | 326 | * @param handler_cls closure for @a handler |
327 | */ | 327 | */ |
328 | void | 328 | void |
329 | reciever (void *cls, | 329 | receiver (void *cls, |
330 | const void *buf, | 330 | const void *buf, |
331 | size_t available, | 331 | size_t available, |
332 | const struct sockaddr *addr, | 332 | const struct sockaddr *addr, |
@@ -355,7 +355,7 @@ register_reciever (struct GNUNET_SOCKS_Handshake *ih, int want) | |||
355 | GNUNET_CONNECTION_receive (ih->socks5_connection, | 355 | GNUNET_CONNECTION_receive (ih->socks5_connection, |
356 | want, | 356 | want, |
357 | GNUNET_TIME_relative_get_minute_ (), | 357 | GNUNET_TIME_relative_get_minute_ (), |
358 | &reciever, | 358 | &receiver, |
359 | ih); | 359 | ih); |
360 | } | 360 | } |
361 | 361 | ||
@@ -475,7 +475,7 @@ GNUNET_SOCKS_init_handshake (const char *user, const char *pass) | |||
475 | *(b++) = SOCKS5_AUTH_USERPASS; | 475 | *(b++) = SOCKS5_AUTH_USERPASS; |
476 | (*n)++; | 476 | (*n)++; |
477 | } | 477 | } |
478 | /* There is no apperent reason to support authentication methods beyond | 478 | /* There is no apparent reason to support authentication methods beyond |
479 | * username and password since afaik Tor does not support them. */ | 479 | * username and password since afaik Tor does not support them. */ |
480 | 480 | ||
481 | /* We authenticate with an empty username and password if the server demands | 481 | /* We authenticate with an empty username and password if the server demands |
diff --git a/src/util/strings.c b/src/util/strings.c index 0fb6eaf0c..61e04c457 100644 --- a/src/util/strings.c +++ b/src/util/strings.c | |||
@@ -445,7 +445,7 @@ GNUNET_STRINGS_fancy_time_to_absolute (const char *fancy_time, | |||
445 | * @param input_charset character set used for @a input | 445 | * @param input_charset character set used for @a input |
446 | * @param output_charset desired character set for the return value | 446 | * @param output_charset desired character set for the return value |
447 | * @return the converted string (0-terminated), | 447 | * @return the converted string (0-terminated), |
448 | * if conversion fails, a copy of the orignal | 448 | * if conversion fails, a copy of the original |
449 | * string is returned. | 449 | * string is returned. |
450 | */ | 450 | */ |
451 | char * | 451 | char * |
@@ -519,7 +519,7 @@ fail: | |||
519 | * @param len the number of bytes in the @a input | 519 | * @param len the number of bytes in the @a input |
520 | * @param charset character set to convert from | 520 | * @param charset character set to convert from |
521 | * @return the converted string (0-terminated), | 521 | * @return the converted string (0-terminated), |
522 | * if conversion fails, a copy of the orignal | 522 | * if conversion fails, a copy of the original |
523 | * string is returned. | 523 | * string is returned. |
524 | */ | 524 | */ |
525 | char * | 525 | char * |
@@ -542,7 +542,7 @@ GNUNET_STRINGS_to_utf8 (const char *input, | |||
542 | * @param len the number of bytes in the @a input | 542 | * @param len the number of bytes in the @a input |
543 | * @param charset character set to convert to | 543 | * @param charset character set to convert to |
544 | * @return the converted string (0-terminated), | 544 | * @return the converted string (0-terminated), |
545 | * if conversion fails, a copy of the orignal | 545 | * if conversion fails, a copy of the original |
546 | * string is returned. | 546 | * string is returned. |
547 | */ | 547 | */ |
548 | char * | 548 | char * |
@@ -641,7 +641,7 @@ GNUNET_STRINGS_filename_expand (const char *fil) | |||
641 | /* do not copy '~' */ | 641 | /* do not copy '~' */ |
642 | fil_ptr = fil + 1; | 642 | fil_ptr = fil + 1; |
643 | 643 | ||
644 | /* skip over dir seperator to be consistent */ | 644 | /* skip over dir separator to be consistent */ |
645 | if (fil_ptr[0] == DIR_SEPARATOR) | 645 | if (fil_ptr[0] == DIR_SEPARATOR) |
646 | fil_ptr++; | 646 | fil_ptr++; |
647 | } | 647 | } |
@@ -1217,7 +1217,7 @@ GNUNET_STRINGS_check_filename (const char *filename, | |||
1217 | * @param addrlen length of @a zt_addr (not counting 0-terminator). | 1217 | * @param addrlen length of @a zt_addr (not counting 0-terminator). |
1218 | * @param r_buf a buffer to fill. Initially gets filled with zeroes, | 1218 | * @param r_buf a buffer to fill. Initially gets filled with zeroes, |
1219 | * then its sin6_port, sin6_family and sin6_addr are set appropriately. | 1219 | * then its sin6_port, sin6_family and sin6_addr are set appropriately. |
1220 | * @return #GNUNET_OK if conversion succeded. | 1220 | * @return #GNUNET_OK if conversion succeeded. |
1221 | * #GNUNET_SYSERR otherwise, in which | 1221 | * #GNUNET_SYSERR otherwise, in which |
1222 | * case the contents of @a r_buf are undefined. | 1222 | * case the contents of @a r_buf are undefined. |
1223 | */ | 1223 | */ |
@@ -1291,7 +1291,7 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, | |||
1291 | * @param zt_addr 0-terminated string. May be mangled by the function. | 1291 | * @param zt_addr 0-terminated string. May be mangled by the function. |
1292 | * @param addrlen length of @a zt_addr (not counting 0-terminator). | 1292 | * @param addrlen length of @a zt_addr (not counting 0-terminator). |
1293 | * @param r_buf a buffer to fill. | 1293 | * @param r_buf a buffer to fill. |
1294 | * @return #GNUNET_OK if conversion succeded. | 1294 | * @return #GNUNET_OK if conversion succeeded. |
1295 | * #GNUNET_SYSERR otherwise, in which case | 1295 | * #GNUNET_SYSERR otherwise, in which case |
1296 | * the contents of @a r_buf are undefined. | 1296 | * the contents of @a r_buf are undefined. |
1297 | */ | 1297 | */ |
@@ -1341,7 +1341,7 @@ GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr, | |||
1341 | * @param addrlen number of bytes in @a addr (if addr is 0-terminated, | 1341 | * @param addrlen number of bytes in @a addr (if addr is 0-terminated, |
1342 | * 0-terminator should not be counted towards addrlen). | 1342 | * 0-terminator should not be counted towards addrlen). |
1343 | * @param r_buf a buffer to fill. | 1343 | * @param r_buf a buffer to fill. |
1344 | * @return #GNUNET_OK if conversion succeded. #GNUNET_SYSERR otherwise, in which | 1344 | * @return #GNUNET_OK if conversion succeeded. #GNUNET_SYSERR otherwise, in which |
1345 | * case the contents of @a r_buf are undefined. | 1345 | * case the contents of @a r_buf are undefined. |
1346 | */ | 1346 | */ |
1347 | int | 1347 | int |
diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c index ffcad888e..c6c6411da 100644 --- a/src/util/test_common_logging_dummy.c +++ b/src/util/test_common_logging_dummy.c | |||
@@ -97,7 +97,7 @@ main (int argc, char *argv[]) | |||
97 | { | 97 | { |
98 | (void) argc; | 98 | (void) argc; |
99 | (void) argv; | 99 | (void) argv; |
100 | /* We set up logging with NULL level - will be overrided by | 100 | /* We set up logging with NULL level - will be overridden by |
101 | * GNUNET_LOG or GNUNET_FORCE_LOG at runtime. | 101 | * GNUNET_LOG or GNUNET_FORCE_LOG at runtime. |
102 | */ | 102 | */ |
103 | GNUNET_log_setup ("test-common-logging-dummy", NULL, "/dev/null"); | 103 | GNUNET_log_setup ("test-common-logging-dummy", NULL, "/dev/null"); |
@@ -107,7 +107,7 @@ main (int argc, char *argv[]) | |||
107 | pr (GNUNET_ERROR_TYPE_INFO, "INFO"); | 107 | pr (GNUNET_ERROR_TYPE_INFO, "INFO"); |
108 | pr (GNUNET_ERROR_TYPE_DEBUG, "DEBUG"); | 108 | pr (GNUNET_ERROR_TYPE_DEBUG, "DEBUG"); |
109 | 109 | ||
110 | /* We set up logging with WARNING level - will onle be overrided by | 110 | /* We set up logging with WARNING level - will onle be overridden by |
111 | * GNUNET_FORCE_LOG at runtime. | 111 | * GNUNET_FORCE_LOG at runtime. |
112 | */ | 112 | */ |
113 | GNUNET_log_setup ("test-common-logging-dummy", "WARNING", "/dev/null"); | 113 | GNUNET_log_setup ("test-common-logging-dummy", "WARNING", "/dev/null"); |
diff --git a/src/util/test_time.c b/src/util/test_time.c index cffa41de9..59917793c 100644 --- a/src/util/test_time.c +++ b/src/util/test_time.c | |||
@@ -133,7 +133,7 @@ main (int argc, char *argv[]) | |||
133 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == | 133 | GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == |
134 | GNUNET_TIME_absolute_get_remaining (forever).rel_value_us); | 134 | GNUNET_TIME_absolute_get_remaining (forever).rel_value_us); |
135 | 135 | ||
136 | /* check endianess */ | 136 | /* check endianness */ |
137 | reln = GNUNET_TIME_relative_hton (rel); | 137 | reln = GNUNET_TIME_relative_hton (rel); |
138 | GNUNET_assert (rel.rel_value_us == GNUNET_TIME_relative_ntoh ( | 138 | GNUNET_assert (rel.rel_value_us == GNUNET_TIME_relative_ntoh ( |
139 | reln).rel_value_us); | 139 | reln).rel_value_us); |
diff --git a/src/util/time.c b/src/util/time.c index a07801922..5205fe11a 100644 --- a/src/util/time.c +++ b/src/util/time.c | |||
@@ -552,7 +552,7 @@ GNUNET_TIME_calculate_eta (struct GNUNET_TIME_Absolute start, | |||
552 | uint64_t finished, | 552 | uint64_t finished, |
553 | uint64_t total) | 553 | uint64_t total) |
554 | { | 554 | { |
555 | struct GNUNET_TIME_Relative dur; | 555 | struct GNUNET_TIME_Relative due; |
556 | double exp; | 556 | double exp; |
557 | struct GNUNET_TIME_Relative ret; | 557 | struct GNUNET_TIME_Relative ret; |
558 | 558 | ||
@@ -561,9 +561,9 @@ GNUNET_TIME_calculate_eta (struct GNUNET_TIME_Absolute start, | |||
561 | return GNUNET_TIME_UNIT_ZERO; | 561 | return GNUNET_TIME_UNIT_ZERO; |
562 | if (0 == finished) | 562 | if (0 == finished) |
563 | return GNUNET_TIME_UNIT_FOREVER_REL; | 563 | return GNUNET_TIME_UNIT_FOREVER_REL; |
564 | dur = GNUNET_TIME_absolute_get_duration (start); | 564 | due = GNUNET_TIME_absolute_get_duration (start); |
565 | exp = ((double) dur.rel_value_us) * ((double) total) / ((double) finished); | 565 | exp = ((double) due.rel_value_us) * ((double) total) / ((double) finished); |
566 | ret.rel_value_us = ((uint64_t) exp) - dur.rel_value_us; | 566 | ret.rel_value_us = ((uint64_t) exp) - due.rel_value_us; |
567 | return ret; | 567 | return ret; |
568 | } | 568 | } |
569 | 569 | ||
diff --git a/src/util/uri.c b/src/util/uri.c index 87101d7e1..fa383110d 100644 --- a/src/util/uri.c +++ b/src/util/uri.c | |||
@@ -302,7 +302,7 @@ GNUNET_uri_split_path (char *path, | |||
302 | * in the yuarel_param struct. | 302 | * in the yuarel_param struct. |
303 | * | 303 | * |
304 | * *query: the query string to parse. The string will be modified. | 304 | * *query: the query string to parse. The string will be modified. |
305 | * delimiter: the character that separates the key/value pairs from eachother. | 305 | * delimiter: the character that separates the key/value pairs from each other. |
306 | * *params: an array of (struct yuarel_param) where to store the result. | 306 | * *params: an array of (struct yuarel_param) where to store the result. |
307 | * max_values: max number of parameters to parse. | 307 | * max_values: max number of parameters to parse. |
308 | * | 308 | * |