From f62e24a88c21235bc3c901508cfb474509ef2961 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 14 Nov 2020 17:17:36 +0100 Subject: spell checking --- src/util/benchmark.c | 2 +- src/util/bio.c | 12 ++++++------ src/util/client.c | 4 ++-- src/util/common_allocation.c | 2 +- src/util/configuration.c | 8 ++++---- src/util/consttime_memcmp.c | 4 ++-- src/util/container_multihashmap.c | 4 ++-- src/util/container_multipeermap.c | 4 ++-- src/util/container_multishortmap.c | 4 ++-- src/util/container_multiuuidmap.c | 4 ++-- src/util/crypto_crc.c | 2 +- src/util/crypto_hash.c | 6 +++--- src/util/crypto_hash_file.c | 2 +- src/util/crypto_kdf.c | 2 +- src/util/crypto_paillier.c | 4 ++-- src/util/crypto_rsa.c | 8 ++++---- src/util/gnunet-resolver.c | 2 +- src/util/gnunet-service-resolver.c | 2 +- src/util/helper.c | 4 ++-- src/util/load.c | 8 ++++---- src/util/mq.c | 8 ++++---- src/util/mst.c | 2 +- src/util/os_installation.c | 4 ++-- src/util/os_priority.c | 2 +- src/util/scheduler.c | 2 +- src/util/socks.c | 20 ++++++++++---------- src/util/strings.c | 14 +++++++------- src/util/test_common_logging_dummy.c | 4 ++-- src/util/test_time.c | 2 +- src/util/time.c | 8 ++++---- src/util/uri.c | 2 +- 31 files changed, 78 insertions(+), 78 deletions(-) (limited to 'src/util') 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) /** * Get benchmark data for a URL. If the URL is too long, it's truncated - * before looking up the correspoding benchmark data. + * before looking up the corresponding benchmark data. * * Statistics are bucketed by URL and status code. * 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) * * @param buffer the buffer to use as source * @param size the total size in bytes of the buffer - * @return IO handle on sucess, NULL on error + * @return IO handle on success, NULL on error */ struct GNUNET_BIO_ReadHandle * 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) /** * Force a file-based buffered writer to flush its buffer. - * If the handle does not use a file, this function returs #GNUNET_OK + * If the handle does not use a file, this function returns #GNUNET_OK * without doing anything. * * @param h the IO handle @@ -1011,7 +1011,7 @@ GNUNET_BIO_read_spec_object (const char *what, /** - * Function used interally to read a string from within a read spec. + * Function used internally to read a string from within a read spec. * * @param cls ignored, always NULL * @param h the IO handle to read from @@ -1110,7 +1110,7 @@ GNUNET_BIO_read_spec_meta_data (const char *what, * @param what what is being read (for error message creation) * @param target where to store the data * @param target_size ignored - * @retun #GNUNET_OK on success, #GNUNET_SYSERR otherwise + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise */ static int read_spec_handler_int32 (void *cls, @@ -1154,7 +1154,7 @@ GNUNET_BIO_read_spec_int32 (const char *what, * @param what what is being read (for error message creation) * @param target where to store the data * @param target_size ignored - * @retun #GNUNET_OK on success, #GNUNET_SYSERR otherwise + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise */ static int read_spec_handler_int64 (void *cls, @@ -1549,7 +1549,7 @@ GNUNET_BIO_write_spec_commit (struct GNUNET_BIO_WriteHandle *h, } /* If it's a file-based handle, the flush makes sure that the data in the - buffer is actualy written to the disk. */ + buffer is actually written to the disk. */ if (IO_FILE == h->type) ret = GNUNET_BIO_flush (h); 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 struct ClientState *cstate; /** - * Lenth of addr. + * Length of addr. */ socklen_t addrlen; @@ -1050,7 +1050,7 @@ GNUNET_CLIENT_test (const struct GNUNET_CONFIGURATION_Handle *cfg, /** * Create a message queue to connect to a GNUnet service. - * If handlers are specfied, receive messages from the connection. + * If handlers are specified, receive messages from the connection. * * @param cfg our configuration * @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, for (size_t i = 0; i < n; i++) { - /* need to cast to (char *) temporarily for byte level acuracy */ + /* need to cast to (char *) temporarily for byte level accuracy */ ret[i] = (char **) ((char *) ret /* base address */ + n * sizeof(void **) /* skip 1. dim header */ + 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 char *key; /** - * current, commited value + * current, committed value */ char *val; }; @@ -515,7 +515,7 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg, m_size = 0; for (sec = cfg->sections; NULL != sec; sec = sec->next) { - /* For each section we need to add 3 charaters: {'[',']','\n'} */ + /* For each section we need to add 3 characters: {'[',']','\n'} */ m_size += strlen (sec->name) + 3; for (ent = sec->entries; NULL != ent; ent = ent->next) { @@ -1230,7 +1230,7 @@ GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg, /** * Expand an expression of the form "$FOO/BAR" to "DIRECTORY/BAR" - * where either in the "PATHS" section or the environtment "FOO" is + * where either in the "PATHS" section or the environment "FOO" is * set to "DIRECTORY". We also support default expansion, * i.e. ${VARIABLE:-default} will expand to $VARIABLE if VARIABLE is * set in PATHS or the environment, and otherwise to "default". Note @@ -1392,7 +1392,7 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg, /** * Expand an expression of the form "$FOO/BAR" to "DIRECTORY/BAR" - * where either in the "PATHS" section or the environtment "FOO" is + * where either in the "PATHS" section or the environment "FOO" is * set to "DIRECTORY". We also support default expansion, * i.e. ${VARIABLE:-default} will expand to $VARIABLE if VARIABLE is * 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. * implementation-defined overflow behaviour is not invoked. * * We rely on the C standard's guarantees regarding the wraparound - * behaviour of unsigned integer arithmetic, and on the analagous + * behaviour of unsigned integer arithmetic, and on the analogous * guarantees regarding conversions from signed types to narrower * unsigned types. * @@ -252,7 +252,7 @@ consttime_memcmp (const void *b1, const void *b2, size_t len) * instead of int because we need a type that's strictly * larger than 16 bits, and the C standard allows * implementations where int is only 16 bits. The result - * from this step will be of type int32_t, and its value wll + * from this step will be of type int32_t, and its value will * be one of 0x00008000 (32768), or in the range 0x00008001 * to 0x000080ff (32769 to 33023), or in the range 0x00007f01 * 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 @@ /** * Maximum recursion depth for callbacks of - * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s + * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). * Should be totally excessive, but if violated we die. */ @@ -184,7 +184,7 @@ struct GNUNET_CONTAINER_MultiHashMapIterator * to be copied as the destination of the pointer is * guaranteed to be life as long as the value is stored in * the hashmap. This can significantly reduce memory - * consumption, but of course is also a recipie for + * consumption, but of course is also a recipe for * heap corruption if the assumption is not true. Only * use this if (1) memory use is important in this case and * (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 @@ /** * Maximum recursion depth for callbacks of - * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s + * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). * Should be totally excessive, but if violated we die. */ @@ -183,7 +183,7 @@ struct GNUNET_CONTAINER_MultiPeerMapIterator * to be copied as the destination of the pointer is * guaranteed to be life as long as the value is stored in * the hashmap. This can significantly reduce memory - * consumption, but of course is also a recipie for + * consumption, but of course is also a recipe for * heap corruption if the assumption is not true. Only * use this if (1) memory use is important in this case and * (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 @@ /** * Maximum recursion depth for callbacks of - * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s + * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). * Should be totally excessive, but if violated we die. */ @@ -184,7 +184,7 @@ struct GNUNET_CONTAINER_MultiShortmapIterator * to be copied as the destination of the pointer is * guaranteed to be life as long as the value is stored in * the hashmap. This can significantly reduce memory - * consumption, but of course is also a recipie for + * consumption, but of course is also a recipe for * heap corruption if the assumption is not true. Only * use this if (1) memory use is important in this case and * (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 @@ /** * Maximum recursion depth for callbacks of - * #GNUNET_CONTAINER_multihashmap_get_multiple() themselve s + * #GNUNET_CONTAINER_multihashmap_get_multiple() themselves s * again calling #GNUNET_CONTAINER_multihashmap_get_multiple(). * Should be totally excessive, but if violated we die. */ @@ -184,7 +184,7 @@ struct GNUNET_CONTAINER_MultiUuidmapIterator * to be copied as the destination of the pointer is * guaranteed to be life as long as the value is stored in * the hashmap. This can significantly reduce memory - * consumption, but of course is also a recipie for + * consumption, but of course is also a recipe for * heap corruption if the assumption is not true. Only * use this if (1) memory use is important in this case and * (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) /** * Convert results from #GNUNET_CRYPTO_crc16_step() to final crc16. * - * @param sum cummulative sum + * @param sum cumulative sum * @return crc16 value */ 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, /** * Convert GNUNET_CRYPTO_hash to ASCII encoding. The ASCII encoding is rather * GNUnet specific. It was chosen such that it only uses characters - * in [0-9A-V], can be produced without complex arithmetics and uses a + * in [0-9A-V], can be produced without complex arithmetic and uses a * small number of characters. The GNUnet encoding uses 103 * characters plus a null terminator. * @@ -463,7 +463,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key, /** - * Context for cummulative hashing. + * Context for cumulative hashing. */ struct GNUNET_HashContext { @@ -501,7 +501,7 @@ GNUNET_CRYPTO_hash_context_start () /** * Add data to be hashed. * - * @param hc cummulative hash context + * @param hc cumulative hash context * @param buf data to add * @param size number of bytes in @a buf */ 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) * @param blocksize number of bytes to process in one task * @param callback function to call upon completion * @param callback_cls closure for @a callback - * @return NULL on (immediate) errror + * @return NULL on (immediate) error */ struct GNUNET_CRYPTO_FileHashContext * 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, (const unsigned char *) buf, sizeof(buf), &rsize); - GNUNET_assert (0 == rc); /* Allocation erro? */ + GNUNET_assert (0 == rc); /* Allocation error? */ gcry_mpi_clear_highbit (*r, nbits); 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 * @param public_key Public key to use. * @param m Plaintext to encrypt. * @param desired_ops How many homomorphic ops the caller intends to use - * @param[out] ciphertext Encrytion of @a plaintext with @a public_key. + * @param[out] ciphertext Encryption of @a plaintext with @a public_key. * @return guaranteed number of supported homomorphic operations >= 1, * or desired_ops, in case that is lower, * or -1 if less than one homomorphic operation is possible @@ -211,7 +211,7 @@ GNUNET_CRYPTO_paillier_encrypt1 (const struct * @param public_key Public key to use. * @param m Plaintext to encrypt. * @param desired_ops How many homomorphic ops the caller intends to use - * @param[out] ciphertext Encrytion of @a plaintext with @a public_key. + * @param[out] ciphertext Encryption of @a plaintext with @a public_key. * @return guaranteed number of supported homomorphic operations >= 1, * or desired_ops, in case that is lower, * 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, * Extract the public key of the given private key. * * @param priv the private key - * @retur NULL on error, otherwise the public key + * @return NULL on error, otherwise the public key */ struct GNUNET_CRYPTO_RsaPublicKey * GNUNET_CRYPTO_rsa_private_key_get_public (const struct @@ -541,7 +541,7 @@ static struct RsaBlindingKey * rsa_blinding_key_derive (const struct GNUNET_CRYPTO_RsaPublicKey *pkey, const struct GNUNET_CRYPTO_RsaBlindingKeySecret *bks) { - char *xts = "Blinding KDF extrator HMAC key"; /* Trusts bks' randomness more */ + char *xts = "Blinding KDF extractor HMAC key"; /* Trusts bks' randomness more */ struct RsaBlindingKey *blind; gcry_mpi_t n; @@ -570,7 +570,7 @@ rsa_blinding_key_derive (const struct GNUNET_CRYPTO_RsaPublicKey *pkey, /* - We originally added GNUNET_CRYPTO_kdf_mod_mpi for the benifit of the + We originally added GNUNET_CRYPTO_kdf_mod_mpi for the benefit of the previous routine. 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, /** * Free memory occupied by signature. * - * @param sig memory to freee + * @param sig memory to free */ void 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) ret = (GNUNET_OK == GNUNET_PROGRAM_run (argc, argv, "gnunet-resolver [hostname]", - gettext_noop ("Use build-in GNUnet stub resolver"), + gettext_noop ("Use built-in GNUnet stub resolver"), options, &run, NULL)) ? 0 : 1; 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) if (GNUNET_OK != GNUNET_DISK_file_handle_size (fh, &bytes_read)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Could not determin size of /etc/hosts. " + "Could not determine size of /etc/hosts. " "DNS resolution will not be possible.\n"); GNUNET_DISK_file_close (fh); 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 struct GNUNET_OS_Process *helper_proc; /** - * The Message-Tokenizer that tokenizes the messages comming from the helper + * The Message-Tokenizer that tokenizes the messages coming from the helper */ struct GNUNET_MessageStreamTokenizer *mst; @@ -646,7 +646,7 @@ helper_write (void *cls) * @param h helper to send message to * @param msg message to send * @param can_drop can the message be dropped if there is already one in the queue? - * @param cont continuation to run once the message is out (#GNUNET_OK on succees, #GNUNET_NO + * @param cont continuation to run once the message is out (#GNUNET_OK on success, #GNUNET_NO * if the helper process died, #GNUNET_SYSERR during #GNUNET_HELPER_destroy). * @param cont_cls closure for @a cont * @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 uint64_t cummulative_squared_delay; /** - * Total number of requests included in the cummulative datastore delay values. + * Total number of requests included in the cumulative datastore delay values. */ uint64_t cummulative_request_count; /** * Current running average datastore delay. Its relation to the - * average datastore delay and it std. dev. (as calcualted from the - * cummulative values) tells us our current load. + * average datastore delay and it std. dev. (as calculated from the + * cumulative values) tells us our current load. */ double runavg_delay; @@ -163,7 +163,7 @@ calculate_load (struct GNUNET_LOAD_Value *load) if (load->cummulative_request_count <= 1) return; - /* calcuate std dev of latency; we have for n values of "i" that: + /* calculate std dev of latency; we have for n values of "i" that: * * avg = (sum val_i) / n * 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 * Call the message message handler that was registered * for the type of the given message in the given message queue. * - * This function is indended to be used for the implementation + * This function is intended to be used for the implementation * of message queues. * * @param mq message queue with the handlers @@ -217,7 +217,7 @@ GNUNET_MQ_inject_message (struct GNUNET_MQ_Handle *mq, * Call the message message handler that was registered * for the type of the given message in the given @a handlers list. * - * This function is indended to be used for the implementation + * This function is intended to be used for the implementation * of message queues. * * @param handlers a set of handlers @@ -1220,7 +1220,7 @@ GNUNET_MQ_dll_remove (struct GNUNET_MQ_Envelope **env_head, /** * Copy an array of handlers. * - * Useful if the array has been delared in local memory and needs to be + * Useful if the array has been declared in local memory and needs to be * persisted for future use. * * @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) /** * Copy an array of handlers, appending AGPL handler. * - * Useful if the array has been delared in local memory and needs to be + * Useful if the array has been declared in local memory and needs to be * persisted for future use. * * @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: else { /* need to copy to private buffer to align; - * yes, we go a bit more spagetti than usual here */ + * yes, we go a bit more spaghetti than usual here */ goto do_align; } } 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 = { static const struct GNUNET_OS_ProjectData *current_pd = &default_pd; /** - * Wether or not gettext has been initialized for the library. + * Whether or not gettext has been initialized for the library. * Note that the gettext initialization done within * GNUNET_PROGRAM_run2 is for the specific application. */ @@ -374,7 +374,7 @@ get_path_from_GNUNET_PREFIX () /** - * @brief get the path to GNUnet bin/ or lib/, prefering the lib/ path + * @brief get the path to GNUnet bin/ or lib/, preferring the lib/ path * @author Milan * * @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, if (lscp[i] != tgt) { /* Bury any existing FD, no matter what; they should all be closed - * on exec anyway and the important onces have been dup'ed away */ + * on exec anyway and the important ones have been dup'ed away */ (void) close (tgt); GNUNET_assert (-1 != dup2 (lscp[i], tgt)); } 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 struct GNUNET_SIGNAL_Context *shc_hup; /** - * context of hte SIGPIPE handler + * context of the SIGPIPE handler */ struct GNUNET_SIGNAL_Context *shc_pipe; }; 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 @@ #define SOCKS5_AUTH_MAF 0x08 /* Multi-Authentication Framework */ -/* SOCKS5 connection responces */ +/* SOCKS5 connection responses */ #define SOCKS5_REP_SUCCEEDED 0x00 /* succeeded */ #define SOCKS5_REP_FAIL 0x01 /* general SOCKS serer failure */ #define SOCKS5_REP_NALLOWED 0x02 /* connection not allowed by ruleset */ @@ -55,7 +55,7 @@ #define SOCKS5_REP_EXPIRED 0x06 /* TTL expired */ #define SOCKS5_REP_CNOTSUP 0x07 /* Command not supported */ #define SOCKS5_REP_ANOTSUP 0x08 /* Address not supported */ -#define SOCKS5_REP_INVADDR 0x09 /* Inalid address */ +#define SOCKS5_REP_INVADDR 0x09 /* Invalid address */ const char * SOCKS5_REP_names (int rep) @@ -155,12 +155,12 @@ struct GNUNET_SOCKS_Handshake int step; /** - * Precomputed SOCKS5 handshake ouput buffer + * Precomputed SOCKS5 handshake output buffer */ unsigned char outbuf[1024]; /** - * Pointers delineating protoocol steps in the outbut buffer + * Pointers delineating protoocol steps in the output buffer */ unsigned char *(outstep[4]); @@ -177,7 +177,7 @@ struct GNUNET_SOCKS_Handshake }; -/* Regitering prototypes */ +/* Registering prototypes */ void register_reciever (struct GNUNET_SOCKS_Handshake *ih, int want); @@ -255,7 +255,7 @@ SOCKS5_handshake_step (struct GNUNET_SOCKS_Handshake *ih) b += 2; break; - case SOCKS5_step_auth: /* SOCKS5 server's responce to authentication */ + case SOCKS5_step_auth: /* SOCKS5 server's response to authentication */ if (b[1] != 0) { LOG (GNUNET_ERROR_TYPE_ERROR, "SOCKS5 authentication failed\n"); @@ -265,7 +265,7 @@ SOCKS5_handshake_step (struct GNUNET_SOCKS_Handshake *ih) b += 2; break; - case SOCKS5_step_cmd: /* SOCKS5 server's responce to command */ + case SOCKS5_step_cmd: /* SOCKS5 server's response to command */ if (b[0] != 5) { LOG (GNUNET_ERROR_TYPE_ERROR, "SOCKS5 protocol error\n"); @@ -326,7 +326,7 @@ SOCKS5_handshake_step (struct GNUNET_SOCKS_Handshake *ih) * @param handler_cls closure for @a handler */ void -reciever (void *cls, +receiver (void *cls, const void *buf, size_t available, const struct sockaddr *addr, @@ -355,7 +355,7 @@ register_reciever (struct GNUNET_SOCKS_Handshake *ih, int want) GNUNET_CONNECTION_receive (ih->socks5_connection, want, GNUNET_TIME_relative_get_minute_ (), - &reciever, + &receiver, ih); } @@ -475,7 +475,7 @@ GNUNET_SOCKS_init_handshake (const char *user, const char *pass) *(b++) = SOCKS5_AUTH_USERPASS; (*n)++; } - /* There is no apperent reason to support authentication methods beyond + /* There is no apparent reason to support authentication methods beyond * username and password since afaik Tor does not support them. */ /* 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, * @param input_charset character set used for @a input * @param output_charset desired character set for the return value * @return the converted string (0-terminated), - * if conversion fails, a copy of the orignal + * if conversion fails, a copy of the original * string is returned. */ char * @@ -519,7 +519,7 @@ fail: * @param len the number of bytes in the @a input * @param charset character set to convert from * @return the converted string (0-terminated), - * if conversion fails, a copy of the orignal + * if conversion fails, a copy of the original * string is returned. */ char * @@ -542,7 +542,7 @@ GNUNET_STRINGS_to_utf8 (const char *input, * @param len the number of bytes in the @a input * @param charset character set to convert to * @return the converted string (0-terminated), - * if conversion fails, a copy of the orignal + * if conversion fails, a copy of the original * string is returned. */ char * @@ -641,7 +641,7 @@ GNUNET_STRINGS_filename_expand (const char *fil) /* do not copy '~' */ fil_ptr = fil + 1; - /* skip over dir seperator to be consistent */ + /* skip over dir separator to be consistent */ if (fil_ptr[0] == DIR_SEPARATOR) fil_ptr++; } @@ -1217,7 +1217,7 @@ GNUNET_STRINGS_check_filename (const char *filename, * @param addrlen length of @a zt_addr (not counting 0-terminator). * @param r_buf a buffer to fill. Initially gets filled with zeroes, * then its sin6_port, sin6_family and sin6_addr are set appropriately. - * @return #GNUNET_OK if conversion succeded. + * @return #GNUNET_OK if conversion succeeded. * #GNUNET_SYSERR otherwise, in which * case the contents of @a r_buf are undefined. */ @@ -1291,7 +1291,7 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, * @param zt_addr 0-terminated string. May be mangled by the function. * @param addrlen length of @a zt_addr (not counting 0-terminator). * @param r_buf a buffer to fill. - * @return #GNUNET_OK if conversion succeded. + * @return #GNUNET_OK if conversion succeeded. * #GNUNET_SYSERR otherwise, in which case * the contents of @a r_buf are undefined. */ @@ -1341,7 +1341,7 @@ GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr, * @param addrlen number of bytes in @a addr (if addr is 0-terminated, * 0-terminator should not be counted towards addrlen). * @param r_buf a buffer to fill. - * @return #GNUNET_OK if conversion succeded. #GNUNET_SYSERR otherwise, in which + * @return #GNUNET_OK if conversion succeeded. #GNUNET_SYSERR otherwise, in which * case the contents of @a r_buf are undefined. */ 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[]) { (void) argc; (void) argv; - /* We set up logging with NULL level - will be overrided by + /* We set up logging with NULL level - will be overridden by * GNUNET_LOG or GNUNET_FORCE_LOG at runtime. */ GNUNET_log_setup ("test-common-logging-dummy", NULL, "/dev/null"); @@ -107,7 +107,7 @@ main (int argc, char *argv[]) pr (GNUNET_ERROR_TYPE_INFO, "INFO"); pr (GNUNET_ERROR_TYPE_DEBUG, "DEBUG"); - /* We set up logging with WARNING level - will onle be overrided by + /* We set up logging with WARNING level - will onle be overridden by * GNUNET_FORCE_LOG at runtime. */ 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[]) GNUNET_assert (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == GNUNET_TIME_absolute_get_remaining (forever).rel_value_us); - /* check endianess */ + /* check endianness */ reln = GNUNET_TIME_relative_hton (rel); GNUNET_assert (rel.rel_value_us == GNUNET_TIME_relative_ntoh ( 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, uint64_t finished, uint64_t total) { - struct GNUNET_TIME_Relative dur; + struct GNUNET_TIME_Relative due; double exp; struct GNUNET_TIME_Relative ret; @@ -561,9 +561,9 @@ GNUNET_TIME_calculate_eta (struct GNUNET_TIME_Absolute start, return GNUNET_TIME_UNIT_ZERO; if (0 == finished) return GNUNET_TIME_UNIT_FOREVER_REL; - dur = GNUNET_TIME_absolute_get_duration (start); - exp = ((double) dur.rel_value_us) * ((double) total) / ((double) finished); - ret.rel_value_us = ((uint64_t) exp) - dur.rel_value_us; + due = GNUNET_TIME_absolute_get_duration (start); + exp = ((double) due.rel_value_us) * ((double) total) / ((double) finished); + ret.rel_value_us = ((uint64_t) exp) - due.rel_value_us; return ret; } 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, * in the yuarel_param struct. * * *query: the query string to parse. The string will be modified. - * delimiter: the character that separates the key/value pairs from eachother. + * delimiter: the character that separates the key/value pairs from each other. * *params: an array of (struct yuarel_param) where to store the result. * max_values: max number of parameters to parse. * -- cgit v1.2.3