aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/argparse.c2
-rw-r--r--common/audit.c2
-rw-r--r--common/audit.h2
-rw-r--r--common/convert.c6
-rw-r--r--common/dotlock.c2
-rw-r--r--common/exechelp-posix.c2
-rw-r--r--common/exechelp-w32.c4
-rw-r--r--common/exechelp-w32ce.c2
-rw-r--r--common/exechelp.h4
-rw-r--r--common/helpfile.c2
-rw-r--r--common/i18n.h2
-rw-r--r--common/iobuf.c2
-rw-r--r--common/iobuf.h8
-rw-r--r--common/localename.c2
-rw-r--r--common/logging.c2
-rw-r--r--common/openpgp-oid.c2
-rw-r--r--common/session-env.c2
-rw-r--r--common/sexputil.c2
-rw-r--r--common/sysutils.c4
-rw-r--r--common/t-sexputil.c2
-rw-r--r--common/ttyio.c2
-rw-r--r--common/util.h2
22 files changed, 30 insertions, 30 deletions
diff --git a/common/argparse.c b/common/argparse.c
index 53c20fca7..b6abf86ba 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -851,7 +851,7 @@ find_long_option( ARGPARSE_ARGS *arg,
/* Would be better if we can do a binary search, but it is not
possible to reorder our option table because we would mess
up our help strings - What we can do is: Build a nice option
- lookup table wehn this function is first invoked */
+ lookup table when this function is first invoked */
if( !*keyword )
return -1;
for(i=0; opts[i].short_opt; i++ )
diff --git a/common/audit.c b/common/audit.c
index 198b8e633..efd5fcd18 100644
--- a/common/audit.c
+++ b/common/audit.c
@@ -164,7 +164,7 @@ audit_release (audit_ctx_t ctx)
/* Set the type for the audit operation. If CTX is NULL, this is a
- dummy fucntion. */
+ dummy function. */
void
audit_set_type (audit_ctx_t ctx, audit_type_t type)
{
diff --git a/common/audit.h b/common/audit.h
index 345477db7..b324a2847 100644
--- a/common/audit.h
+++ b/common/audit.h
@@ -174,7 +174,7 @@ typedef enum
AUDIT_ROOT_TRUSTED, /* cert, err */
/* Tells whether the root certificate is trusted. This event is
- emmited durcing chain validation. */
+ emitted during chain validation. */
AUDIT_CRL_CHECK, /* err */
/* Tells the status of a CRL or OCSP check. */
diff --git a/common/convert.c b/common/convert.c
index 6b0ff3548..30e5a60f3 100644
--- a/common/convert.c
+++ b/common/convert.c
@@ -70,7 +70,7 @@ hex2bin (const char *string, void *buffer, size_t length)
/* Convert STRING consisting of hex characters into its binary representation
and store that at BUFFER. BUFFER needs to be of LENGTH bytes. The
function check that the STRING will convert exactly to LENGTH
- bytes. Colons inbetween the hex digits are allowed, if one colon
+ bytes. Colons between the hex digits are allowed, if one colon
has been given a colon is expected very 2 characters. The string
is delimited by either end of string or a white space character.
The function returns -1 on error or the length of the parsed
@@ -180,7 +180,7 @@ bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
Nul byte at the end is used to make sure tha the result can always
be used as a C-string.
- BUFSIZE is the availabe length of BUFFER; if the converted result
+ BUFSIZE is the available length of BUFFER; if the converted result
plus a possible required extra Nul character does not fit into this
buffer, the function returns NULL and won't change the existing
content of BUFFER. In-place conversion is possible as long as
@@ -190,7 +190,7 @@ bin2hexcolon (const void *buffer, size_t length, char *stringbuf)
does not store anything. This may be used to find the end of
HEXSTRING.
- On sucess the function returns a pointer to the next character
+ On success the function returns a pointer to the next character
after HEXSTRING (which is either end-of-string or a the next white
space). If BUFLEN is not NULL the number of valid vytes in BUFFER
is stored there (an extra Nul byte is not counted); this will even
diff --git a/common/dotlock.c b/common/dotlock.c
index bccd0c69f..d88085979 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -1293,7 +1293,7 @@ dotlock_remove_lockfiles (void)
dotlock_t h, h2;
/* First set the lockfiles list to NULL so that for example
- dotlock_release is ware that this fucntion is currently
+ dotlock_release is aware that this function is currently
running. */
LOCK_all_lockfiles ();
h = all_lockfiles;
diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index 2bf2592e0..5706dbe1f 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -171,7 +171,7 @@ close_all_fds (int first, int *except)
/* Returns an array with all currently open file descriptors. The end
of the array is marked by -1. The caller needs to release this
array using the *standard free* and not with xfree. This allow the
- use of this fucntion right at startup even before libgcrypt has
+ use of this function right at startup even before libgcrypt has
been initialized. Returns NULL on error and sets ERRNO
accordingly. */
int *
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index ba3b357e9..bc9b5b460 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -116,7 +116,7 @@ close_all_fds (int first, int *except)
/* Returns an array with all currently open file descriptors. The end
of the array is marked by -1. The caller needs to release this
array using the *standard free* and not with xfree. This allow the
- use of this fucntion right at startup even before libgcrypt has
+ use of this function right at startup even before libgcrypt has
been initialized. Returns NULL on error and sets ERRNO
accordingly. */
int *
@@ -751,7 +751,7 @@ gnupg_release_process (pid_t pid)
}
-/* Spawn a new process and immediatley detach from it. The name of
+/* Spawn a new process and immediately detach from it. The name of
the program to exec is PGMNAME and its arguments are in ARGV (the
programname is automatically passed as first argument).
Environment strings in ENVP are set. An error is returned if
diff --git a/common/exechelp-w32ce.c b/common/exechelp-w32ce.c
index 975386a13..49ccdbb99 100644
--- a/common/exechelp-w32ce.c
+++ b/common/exechelp-w32ce.c
@@ -799,7 +799,7 @@ gnupg_release_process (pid_t pid)
}
-/* Spawn a new process and immediatley detach from it. The name of
+/* Spawn a new process and immediately detach from it. The name of
the program to exec is PGMNAME and its arguments are in ARGV (the
programname is automatically passed as first argument).
Environment strings in ENVP are set. An error is returned if
diff --git a/common/exechelp.h b/common/exechelp.h
index a146d893a..908834238 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -46,7 +46,7 @@ void close_all_fds (int first, int *except);
/* Returns an array with all currently open file descriptors. The end
of the array is marked by -1. The caller needs to release this
array using the *standard free* and not with xfree. This allow the
- use of this fucntion right at startup even before libgcrypt has
+ use of this function right at startup even before libgcrypt has
been initialized. Returns NULL on error and sets ERRNO accordingly. */
int *get_all_open_fds (void);
@@ -168,7 +168,7 @@ void gnupg_kill_process (pid_t pid);
void gnupg_release_process (pid_t pid);
-/* Spawn a new process and immediatley detach from it. The name of
+/* Spawn a new process and immediately detach from it. The name of
the program to exec is PGMNAME and its arguments are in ARGV (the
programname is automatically passed as first argument).
Environment strings in ENVP are set. An error is returned if
diff --git a/common/helpfile.c b/common/helpfile.c
index faed8191a..0fb4e0212 100644
--- a/common/helpfile.c
+++ b/common/helpfile.c
@@ -216,7 +216,7 @@ findkey_locale (const char *key, const char *locname,
/usr/share/gnupg/help.txt
Here LL denotes the two digit language code of the current locale.
- If ONLY_CURRENT_LOCALE is set, the fucntion won;t fallback to the
+ If ONLY_CURRENT_LOCALE is set, the function won't fallback to the
english valiant ("help.txt") unless that locale has been requested.
The help file needs to be encoded in UTF-8, lines with a '#' in the
diff --git a/common/i18n.h b/common/i18n.h
index 45710b2cc..22e8a9017 100644
--- a/common/i18n.h
+++ b/common/i18n.h
@@ -53,7 +53,7 @@ const char *i18n_utf8 (const char *string);
const char *i18n_localegettext (const char *lc_messages, const char *string)
GNUPG_GCC_ATTR_FORMAT_ARG(2);
-/* If a module wants a local L_() fucntion we define it here. */
+/* If a module wants a local L_() function we define it here. */
#ifdef LunderscoreIMPL
LunderscorePROTO
LunderscoreIMPL
diff --git a/common/iobuf.c b/common/iobuf.c
index ca8609e70..12affcb4b 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -1141,7 +1141,7 @@ iobuf_close (iobuf_t a)
a->chain, NULL, &dummy_len)))
log_error ("IOBUFCTRL_FREE failed on close: %s\n", gpg_strerror (rc));
if (! rc && rc2)
- /* Whoops! An error occured. Save it in RC if we haven't
+ /* Whoops! An error occurred. Save it in RC if we haven't
already recorded an error. */
rc = rc2;
diff --git a/common/iobuf.h b/common/iobuf.h
index e106292c6..cb7910510 100644
--- a/common/iobuf.h
+++ b/common/iobuf.h
@@ -426,7 +426,7 @@ int iobuf_push_filter2 (iobuf_t a,
IOBUF_DEBUG_MODE is not 0. */
int iobuf_print_chain (iobuf_t a);
-/* Indicate that some error occured on the specified filter. */
+/* Indicate that some error occurred on the specified filter. */
#define iobuf_set_error(a) do { (a)->error = 1; } while(0)
/* Return any pending error on filter A. */
@@ -458,7 +458,7 @@ off_t iobuf_tell (iobuf_t a);
That is, data is appended to the buffer and the seek does not
cause the size of the buffer to grow.
- If no error occured, then any limit previous set by
+ If no error occurred, then any limit previous set by
iobuf_set_limit() is cleared. Further, any error on the filter
(the file filter or the temp filter) is cleared.
@@ -555,8 +555,8 @@ size_t iobuf_temp_to_buffer (iobuf_t a, byte * buffer, size_t buflen);
/* Copies the data from the input iobuf SOURCE to the output iobuf
DEST until either an error is encountered or EOF is reached.
Returns the number of bytes successfully written. If an error
- occured, then any buffered bytes are not returned to SOURCE and are
- effectively lost. To check if an error occured, use
+ occurred, then any buffered bytes are not returned to SOURCE and are
+ effectively lost. To check if an error occurred, use
iobuf_error. */
size_t iobuf_copy (iobuf_t dest, iobuf_t source);
diff --git a/common/localename.c b/common/localename.c
index 54d22d0cf..876fdb023 100644
--- a/common/localename.c
+++ b/common/localename.c
@@ -55,7 +55,7 @@
/* Use a dummy value for LC_MESSAGES in case it is not defined. This
works because we always test for HAVE_LC_MESSAGES and the core
- fucntion takes the category as a string as well. */
+ function takes the category as a string as well. */
#ifndef HAVE_LC_MESSAGES
#define LC_MESSAGES 0
#endif
diff --git a/common/logging.c b/common/logging.c
index 2932c3dea..54b8c8960 100644
--- a/common/logging.c
+++ b/common/logging.c
@@ -204,7 +204,7 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size)
avoids the ugly mix of fd and estream code. */
/* Note that we always try to reconnect to the socket but print
- error messages only the first time an error occured. If
+ error messages only the first time an error occurred. If
RUNNING_DETACHED is set we don't fall back to stderr and even do
not print any error messages. This is needed because detached
processes often close stderr and by writing to file descriptor 2
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index 8a964a4a3..1b6d5f373 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -390,7 +390,7 @@ curve_supported_p (const char *name)
/* Enumerate available and supported OpenPGP curves. The caller needs
to set the integer variable at ITERP to zero and keep on calling
- this fucntion until NULL is returned. */
+ this function until NULL is returned. */
const char *
openpgp_enum_curves (int *iterp)
{
diff --git a/common/session-env.c b/common/session-env.c
index 171bf8f34..8c3dbb5e7 100644
--- a/common/session-env.c
+++ b/common/session-env.c
@@ -97,7 +97,7 @@ static size_t lastallocatedarraysize;
/* Return the names of standard environment variables one after the
other. The caller needs to set the value at the address of
- ITERATOR initally to 0 and then call this function until it returns
+ ITERATOR initially to 0 and then call this function until it returns
NULL. */
const char *
session_env_list_stdenvnames (int *iterator, const char **r_assname)
diff --git a/common/sexputil.c b/common/sexputil.c
index c24facb4e..a63fc20ce 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -335,7 +335,7 @@ hash_algo_from_sigval (const unsigned char *sigval)
if (sskip (&s, &depth) || depth)
return 0; /* Invalid S-expression. */
if (*s != '(')
- return 0; /* No futher list. */
+ return 0; /* No further list. */
/* Check whether this is (hash ALGO). */
s++;
n = snext (&s);
diff --git a/common/sysutils.c b/common/sysutils.c
index 397184583..ccd35422c 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -267,7 +267,7 @@ check_permissions(const char *path,int extension,int checkonly)
#endif
-/* Wrapper around the usual sleep fucntion. This one won't wake up
+/* Wrapper around the usual sleep function. This one won't wake up
before the sleep time has really elapsed. When build with Pth it
merely calls pth_sleep and thus suspends only the current
thread. */
@@ -446,7 +446,7 @@ gnupg_tmpfile (void)
some folks close them before an exec and the next file we open will
get one of them assigned and thus any output (i.e. diagnostics) end
up in that file (e.g. the trustdb). Not actually a gpg problem as
- this will hapen with almost all utilities when called in a wrong
+ this will happen with almost all utilities when called in a wrong
way. However we try to minimize the damage here and raise
awareness of the problem.
diff --git a/common/t-sexputil.c b/common/t-sexputil.c
index 987b06255..77f819930 100644
--- a/common/t-sexputil.c
+++ b/common/t-sexputil.c
@@ -79,7 +79,7 @@ test_make_canon_sexp_from_rsa_pk (void)
size_t elen;
unsigned char *result;
size_t resultlen;
- gpg_err_code_t reverr; /* Expected error from the reverse fucntion. */
+ gpg_err_code_t reverr; /* Expected error from the reverse function. */
} tests[] = {
{
"\x82\xB4\x12\x48\x08\x48\xC0\x76\xAA\x8E\xF1\xF8\x7F\x5E\x9B\x89"
diff --git a/common/ttyio.c b/common/ttyio.c
index 3b409e995..61674128f 100644
--- a/common/ttyio.c
+++ b/common/ttyio.c
@@ -502,7 +502,7 @@ do_get( const char *prompt, int hidden )
do {
#ifdef HAVE_W32CE_SYSTEM
/* Using getchar is not a correct solution but for now it
- doesn't matter becuase we have no real console at all. We
+ doesn't matter because we have no real console at all. We
should rework this as soon as we have switched this entire
module to estream. */
c = getchar();
diff --git a/common/util.h b/common/util.h
index b2651c444..81d63ee2b 100644
--- a/common/util.h
+++ b/common/util.h
@@ -221,7 +221,7 @@ extern gpg_err_source_t default_errsource;
/* Convenience function to return a gpg-error code for memory
allocation failures. This function makes sure that an error will
- be returned even if accidently ERRNO is not set. */
+ be returned even if accidentally ERRNO is not set. */
static inline gpg_error_t
out_of_core (void)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 21:16:29 +0000