diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/argparse.c | 2 | ||||
| -rw-r--r-- | common/asshelp.c | 2 | ||||
| -rw-r--r-- | common/asshelp2.c | 2 | ||||
| -rw-r--r-- | common/audit.c | 2 | ||||
| -rw-r--r-- | common/dotlock.c | 4 | ||||
| -rw-r--r-- | common/exectool.c | 4 | ||||
| -rw-r--r-- | common/exectool.h | 4 | ||||
| -rw-r--r-- | common/homedir.c | 2 | ||||
| -rw-r--r-- | common/percent.c | 2 | ||||
| -rw-r--r-- | common/session-env.c | 2 | ||||
| -rw-r--r-- | common/t-name-value.c | 2 | ||||
| -rw-r--r-- | common/t-openpgp-oid.c | 2 | ||||
| -rw-r--r-- | common/t-percent.c | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/common/argparse.c b/common/argparse.c index db0b7e079..c2ba52e3f 100644 --- a/common/argparse.c +++ b/common/argparse.c @@ -22,7 +22,7 @@ /* This file may be used as part of GnuPG or standalone. A GnuPG build is detected by the presence of the macro GNUPG_MAJOR_VERSION. - Some feature are only availalbe in the GnuPG build mode. + Some feature are only available in the GnuPG build mode. */ #ifdef HAVE_CONFIG_H diff --git a/common/asshelp.c b/common/asshelp.c index 83c378786..fe49aa83a 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -600,7 +600,7 @@ start_new_service (assuan_context_t *r_ctx, } -/* Try to connect tothe agent or start a new one. */ +/* Try to connect to the agent or start a new one. */ gpg_error_t start_new_gpg_agent (assuan_context_t *r_ctx, gpg_err_source_t errsource, diff --git a/common/asshelp2.c b/common/asshelp2.c index 8410808e3..a62189df9 100644 --- a/common/asshelp2.c +++ b/common/asshelp2.c @@ -45,7 +45,7 @@ static assuan_context_t (*the_assuan_ctx_func)(ctrl_t ctrl); -/* Set FUNC to be used as a mapping fucntion from CTRL to an assuan +/* Set FUNC to be used as a mapping function from CTRL to an assuan * context. Pass NULL for FUNC to disable the use of the assuan * context in this module. */ void diff --git a/common/audit.c b/common/audit.c index 179bf72fe..6185df37c 100644 --- a/common/audit.c +++ b/common/audit.c @@ -80,7 +80,7 @@ static void writeout_rem (audit_ctx_t ctx, /* Add NAME to the list of help tags. NAME needs to be a const string - an this function merly stores this pointer. */ + an this function merely stores this pointer. */ static void add_helptag (audit_ctx_t ctx, const char *name) { diff --git a/common/dotlock.c b/common/dotlock.c index 2dc143001..8d9ee5139 100644 --- a/common/dotlock.c +++ b/common/dotlock.c @@ -124,7 +124,7 @@ that the handle shall only be used by one thread at a time. This function creates a unique file temporary file (".#lk*") in the same directory as FNAME and returns a handle for further operations. - The module keeps track of theses unique files so that they will be + The module keeps track of these unique files so that they will be unlinked using the atexit handler. If you don't need the lock file anymore, you may also explicitly remove it with a call to: @@ -1110,7 +1110,7 @@ dotlock_take_unix (dotlock_t h, long timeout) } else if ( same_node && kill (pid, 0) && errno == ESRCH ) { - /* Note: It is unlikley that we get a race here unless a pid is + /* Note: It is unlikely that we get a race here unless a pid is reused too fast or a new process with the same pid as the one of the stale file tries to lock right at the same time as we. */ my_info_1 (_("removing stale lockfile (created by %d)\n"), pid); diff --git a/common/exectool.c b/common/exectool.c index 82b398542..49a619734 100644 --- a/common/exectool.c +++ b/common/exectool.c @@ -305,7 +305,7 @@ copy_buffer_flush (struct copy_buffer *c, estream_t sink) /* Run the program PGMNAME with the command line arguments given in * the NULL terminates array ARGV. If INPUT is not NULL it will be * fed to stdin of the process. stderr is logged using log_info and - * the process' stdout is written to OUTPUT. If OUTPUT is NULL the + * the process's stdout is written to OUTPUT. If OUTPUT is NULL the * output is discarded. If INEXTRA is given, an additional input * stream will be passed to the child; to tell the child about this * ARGV is scanned and the first occurrence of an argument @@ -582,7 +582,7 @@ nop_free (void *ptr) /* Run the program PGMNAME with the command line arguments given in the NULL terminates array ARGV. If INPUT_STRING is not NULL it will be fed to stdin of the process. stderr is logged using - log_info and the process' stdout is returned in a newly malloced + log_info and the process's stdout is returned in a newly malloced buffer RESULT with the length stored at RESULTLEN if not given as NULL. A hidden Nul is appended to the output. On error NULL is stored at RESULT, a diagnostic is printed, and an error code diff --git a/common/exectool.h b/common/exectool.h index 27bbfc9e5..108903f21 100644 --- a/common/exectool.h +++ b/common/exectool.h @@ -46,7 +46,7 @@ typedef void (*exec_tool_status_cb_t) (void *opaque, /* Run the program PGMNAME with the command line arguments given in the NULL terminates array ARGV. If INPUT_STRING is not NULL it will be fed to stdin of the process. stderr is logged using - log_info and the process' stdout is returned in a newly malloced + log_info and the process's stdout is returned in a newly malloced buffer RESULT with the length stored at RESULTLEN if not given as NULL. A hidden Nul is appended to the output. On error NULL is stored at RESULT, a diagnostic is printed, and an error code @@ -58,7 +58,7 @@ gpg_error_t gnupg_exec_tool (const char *pgmname, const char *argv[], /* Run the program PGMNAME with the command line arguments given in the NULL terminates array ARGV. If INPUT is not NULL it will be fed to stdin of the process. stderr is logged using log_info and - the process' stdout is written to OUTPUT. On error a diagnostic is + the process's stdout is written to OUTPUT. On error a diagnostic is printed, and an error code returned. INEXTRA is reserved. */ gpg_error_t gnupg_exec_tool_stream (const char *pgmname, const char *argv[], estream_t input, estream_t inextra, diff --git a/common/homedir.c b/common/homedir.c index 61d3edfb4..7265965e1 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -87,7 +87,7 @@ static byte w32_portable_app; #endif /*HAVE_W32_SYSTEM*/ #ifdef HAVE_W32_SYSTEM -/* This flag is true if this process' binary has been installed under +/* This flag is true if this process's binary has been installed under bin and not in the root directory as often used before GnuPG 2.1. */ static byte w32_bin_is_bin; #endif /*HAVE_W32_SYSTEM*/ diff --git a/common/percent.c b/common/percent.c index ecc6a1959..debf15784 100644 --- a/common/percent.c +++ b/common/percent.c @@ -41,7 +41,7 @@ * function returns the new string or NULL in case of a malloc * failure. * - * Note that this fucntion also escapes the quote character to work + * Note that this function also escapes the quote character to work * around a bug in the mingw32 runtime which does not correctly handle * command line quoting. We correctly double the quote mark when * calling a program (i.e. gpg-protect-tool), but the pre-main code diff --git a/common/session-env.c b/common/session-env.c index c1eb1d959..30241a993 100644 --- a/common/session-env.c +++ b/common/session-env.c @@ -375,7 +375,7 @@ session_env_getenv_or_default (session_env_t se, const char *name, until it returns NULL. The value is returned at R_VALUE. If R_DEFAULT is not NULL, the default flag is stored on return. The default flag indicates that the value has been taken from the - process' environment. The caller must not change the returned + process's environment. The caller must not change the returned name or value. */ char * session_env_listenv (session_env_t se, int *iterator, diff --git a/common/t-name-value.c b/common/t-name-value.c index 13a383ddb..bd17404ac 100644 --- a/common/t-name-value.c +++ b/common/t-name-value.c @@ -350,7 +350,7 @@ run_modification_tests (void) assert (!err); e = nvc_lookup (pk, "Key:"); assert (e); - nvc_delete_named (pk, "Kez:"); /* Delete an inexistant name. */ + nvc_delete_named (pk, "Kez:"); /* Delete an nonexistent name. */ e = nvc_lookup (pk, "Key:"); assert (e); nvc_delete_named (pk, "Key:"); diff --git a/common/t-openpgp-oid.c b/common/t-openpgp-oid.c index 56fb6fefe..6736fa6a9 100644 --- a/common/t-openpgp-oid.c +++ b/common/t-openpgp-oid.c @@ -274,7 +274,7 @@ test_get_keyalgo_string (void) int oops = 0; int pass; - /* We do several passes becuase that is how the function is + /* We do several passes because that is how the function is * called. */ for (pass=0; pass < 3; pass++) for (idx=0; idx < DIM (samples); idx++) diff --git a/common/t-percent.c b/common/t-percent.c index 774fa80ee..42b54165f 100644 --- a/common/t-percent.c +++ b/common/t-percent.c @@ -222,7 +222,7 @@ test_percent_data_escape (void) { /* Note extra condition above handles the one test case * which reverts a plus to a space due to the use of the - * plus-unescape fucntion also for the prefix part. */ + * plus-unescape function also for the prefix part. */ fail (i); } else if (memcmp (buf+prefixlen, tbl[i].data, tbl[i].datalen)) |