aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/ChangeLog-2011.include2
-rw-r--r--common/audit.c2
-rw-r--r--common/call-gpg.c2
-rw-r--r--common/dotlock.c2
-rw-r--r--common/exechelp.h4
-rw-r--r--common/exectool.c2
-rw-r--r--common/init.h2
-rw-r--r--common/openpgp-oid.c2
-rw-r--r--common/recsel.c2
-rw-r--r--common/sexputil.c4
-rw-r--r--common/simple-pwquery.h2
-rw-r--r--common/sysutils.c2
-rw-r--r--common/t-session-env.c2
13 files changed, 15 insertions, 15 deletions
diff --git a/common/ChangeLog-2011.include b/common/ChangeLog-2011.include
index b5a9a5ec6..b9ca86135 100644
--- a/common/ChangeLog-2011.include
+++ b/common/ChangeLog-2011.include
@@ -250,7 +250,7 @@
2001-12-19 Werner Koch <[email protected]>
* util.h [CYGWIN32]: Allow this as an alias for MINGW32. Include
- stdarg.h becuase we use the va_list type. By Disastry.
+ stdarg.h because we use the va_list type. By Disastry.
2001-09-28 Werner Koch <[email protected]>
diff --git a/common/audit.c b/common/audit.c
index 7d545a349..179bf72fe 100644
--- a/common/audit.c
+++ b/common/audit.c
@@ -716,7 +716,7 @@ list_cert (audit_ctx_t ctx, ksba_cert_t cert, int with_subj)
/* List the chain of certificates from STARTITEM up to STOPEVENT. The
- certifcates are written out as comments. */
+ certificates are written out as comments. */
static void
list_certchain (audit_ctx_t ctx, log_item_t startitem, audit_event_t stopevent)
{
diff --git a/common/call-gpg.c b/common/call-gpg.c
index d42325aed..c1472e961 100644
--- a/common/call-gpg.c
+++ b/common/call-gpg.c
@@ -75,7 +75,7 @@ start_gpg (ctrl_t ctrl, const char *gpg_program, strlist_t gpg_arguments,
return err;
}
- /* The first time we are used, intialize the gpg_program variable. */
+ /* The first time we are used, initialize the gpg_program variable. */
if ( !gpg_program || !*gpg_program )
gpg_program = gnupg_module_name (GNUPG_MODULE_NAME_GPG);
diff --git a/common/dotlock.c b/common/dotlock.c
index cbbd0f3f9..5227bb64e 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -332,7 +332,7 @@
# endif
#endif
-/* In GnuPG we use wrappers around the malloc fucntions. If they are
+/* In GnuPG we use wrappers around the malloc functions. If they are
not defined we assume that this code is used outside of GnuPG and
fall back to the regular malloc functions. */
#ifndef xtrymalloc
diff --git a/common/exechelp.h b/common/exechelp.h
index 6f2653b5d..2b40ba098 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -115,7 +115,7 @@ gpg_error_t gnupg_create_pipe (int filedes[2]);
GNUPG_SPAWN_RUN_ASFW
On W32 (but not on W32CE) run AllowSetForegroundWindow for
the child. Note that due to unknown problems this actually
- allows SetForegroundWindow for all childs of this process.
+ allows SetForegroundWindow for all children of this process.
*/
gpg_error_t
@@ -162,7 +162,7 @@ gpg_error_t gnupg_spawn_process_fd (const char *pgmname,
Other error codes may be returned as well. Unless otherwise noted,
-1 will be stored at R_EXITCODE. R_EXITCODE may be passed as NULL
- if the exit code is not required (in that case an error messge will
+ if the exit code is not required (in that case an error message will
be printed). Note that under Windows PID is not the process id but
the handle of the process. */
gpg_error_t gnupg_wait_process (const char *pgmname, pid_t pid, int hang,
diff --git a/common/exectool.c b/common/exectool.c
index c9e00205a..3458de4a7 100644
--- a/common/exectool.c
+++ b/common/exectool.c
@@ -430,7 +430,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
/* Now read as long as we have something to poll. We continue
reading even after EOF or error on stdout so that we get the
- other error messages or remaining outut. */
+ other error messages or remaining output. */
while (! (fds[1].ignore && fds[2].ignore))
{
count = es_poll (fds, DIM(fds), -1);
diff --git a/common/init.h b/common/init.h
index 28462a729..3a5becaeb 100644
--- a/common/init.h
+++ b/common/init.h
@@ -1,4 +1,4 @@
-/* init.h - Definitions for init fucntions.
+/* init.h - Definitions for init functions.
* Copyright (C) 2007, 2012 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index e7c68f290..d800e7d57 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -141,7 +141,7 @@ openpgp_oid_from_str (const char *string, gcry_mpi_t *r_mpi)
if (arcno == 1)
{
if (val > 2)
- break; /* Not allowed, error catched below. */
+ break; /* Not allowed, error caught below. */
val1 = val;
}
else if (arcno == 2)
diff --git a/common/recsel.c b/common/recsel.c
index 66c1c5e08..b2b302b75 100644
--- a/common/recsel.c
+++ b/common/recsel.c
@@ -602,7 +602,7 @@ recsel_select (recsel_expr_t selector,
if (result)
{
- /* This expression evaluated to true. See wether there are
+ /* This expression evaluated to true. See whether there are
remaining expressions in this conjunction. */
if (!se->next || se->next->disjun)
break; /* All expressions are true. Return True. */
diff --git a/common/sexputil.c b/common/sexputil.c
index a8dc1a58c..f30790aa1 100644
--- a/common/sexputil.c
+++ b/common/sexputil.c
@@ -29,7 +29,7 @@
*/
/* This file implements a few utility functions useful when working
- with canonical encrypted S-expresions (i.e. not the S-exprssion
+ with canonical encrypted S-expressions (i.e. not the S-exprssion
objects from libgcrypt). */
#include <config.h>
@@ -266,7 +266,7 @@ cmp_simple_canon_sexp (const unsigned char *a_orig,
/* Create a simple S-expression from the hex string at LINE. Returns
a newly allocated buffer with that canonical encoded S-expression
or NULL in case of an error. On return the number of characters
- scanned in LINE will be stored at NSCANNED. This fucntions stops
+ scanned in LINE will be stored at NSCANNED. This functions stops
converting at the first character not representing a hexdigit. Odd
numbers of hex digits are allowed; a leading zero is then
assumed. If no characters have been found, NULL is returned.*/
diff --git a/common/simple-pwquery.h b/common/simple-pwquery.h
index 772aa398c..9bbc53f50 100644
--- a/common/simple-pwquery.h
+++ b/common/simple-pwquery.h
@@ -1,4 +1,4 @@
-/* simple-pwquery.c - A simple password query cleint for gpg-agent
+/* simple-pwquery.c - A simple password query client for gpg-agent
* Copyright (C) 2002 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
diff --git a/common/sysutils.c b/common/sysutils.c
index a796677ba..ea0acdb3e 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -416,7 +416,7 @@ translate_sys2libc_fd_int (int fd, int for_write)
/* Check whether FNAME has the form "-&nnnn", where N is a non-zero
* number. Returns this number or -1 if it is not the case. If the
* caller wants to use the file descriptor for writing FOR_WRITE shall
- * be set to 1. If NOTRANSLATE is set the Windows spefic mapping is
+ * be set to 1. If NOTRANSLATE is set the Windows specific mapping is
* not done. */
int
check_special_filename (const char *fname, int for_write, int notranslate)
diff --git a/common/t-session-env.c b/common/t-session-env.c
index aa9d596e5..e2b942c6a 100644
--- a/common/t-session-env.c
+++ b/common/t-session-env.c
@@ -103,7 +103,7 @@ test_all (void)
if (gpg_err_code (err) != GPG_ERR_INV_VALUE)
fail (err);
- /* Delete some nonexistant variables. */
+ /* Delete some nonexistent variables. */
err = session_env_putenv (se, "A");
if (err)
fail (err);