aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--agent/call-scd.c6
-rw-r--r--dirmngr/ChangeLog-20114
-rw-r--r--g10/trustdb.c2
-rw-r--r--g13/server.c2
-rw-r--r--g13/sh-cmd.c2
-rw-r--r--tools/gpgparsemail.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 33a08a995..8d46b905d 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -50,13 +50,13 @@
/* Definition of module local data of the CTRL structure. */
struct scd_local_s
{
- /* We keep a list of all allocated context with an achnor at
+ /* We keep a list of all allocated context with an anchor at
SCD_LOCAL_LIST (see below). */
struct scd_local_s *next_local;
/* We need to get back to the ctrl object actually referencing this
- structure. This is really an awkward way of enumerint the lcoal
- contects. A much cleaner way would be to keep a global list of
+ structure. This is really an awkward way of enumerating the local
+ contexts. A much cleaner way would be to keep a global list of
ctrl objects to enumerate them. */
ctrl_t ctrl_backlink;
diff --git a/dirmngr/ChangeLog-2011 b/dirmngr/ChangeLog-2011
index a793a33fc..243f2b56f 100644
--- a/dirmngr/ChangeLog-2011
+++ b/dirmngr/ChangeLog-2011
@@ -1497,7 +1497,7 @@
* dirmngr-client.c (inq_cert): Ignore "SENDCERT" and
"SENDISSUERCERT".
- * server.c (do_get_cert_local): Limit the length of a retruned
+ * server.c (do_get_cert_local): Limit the length of a returned
certificate. Return NULL without an error if an empry value has
been received.
@@ -1897,7 +1897,7 @@
corrupted CRL files.
(open_dir): Read the new dbfile hash field.
- * src/crlfetch.c (crl_fetch, crl_fetch_default): Changed to retrun
+ * src/crlfetch.c (crl_fetch, crl_fetch_default): Changed to return
a stream.
(fun_reader, fun_closer, setup_funopen): New.
* src/server.c (inquire_cert): Changed to use the new stream interface
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 103f83ec9..5f68012f9 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -222,7 +222,7 @@ tdb_register_trusted_key( const char *string )
/*
* Helper to add a key to the global list of ultimately trusted keys.
- * Retruns: true = inserted, false = already in list.
+ * Returns: true = inserted, false = already in list.
*/
static int
add_utk (u32 *kid)
diff --git a/g13/server.c b/g13/server.c
index 0c4563e6a..e3cb313a2 100644
--- a/g13/server.c
+++ b/g13/server.c
@@ -44,7 +44,7 @@ static FILE *statusfp;
the CTRL object of each connection. */
struct server_local_s
{
- /* The Assuan contect we are working on. */
+ /* The Assuan context we are working on. */
assuan_context_t assuan_ctx;
char *containername; /* Malloced active containername. */
diff --git a/g13/sh-cmd.c b/g13/sh-cmd.c
index a54f0aec9..523ec56f6 100644
--- a/g13/sh-cmd.c
+++ b/g13/sh-cmd.c
@@ -35,7 +35,7 @@
the CTRL object of each connection. */
struct server_local_s
{
- /* The Assuan contect we are working on. */
+ /* The Assuan context we are working on. */
assuan_context_t assuan_ctx;
/* The malloced name of the device. */
diff --git a/tools/gpgparsemail.c b/tools/gpgparsemail.c
index 8c9c4d4ec..b12209755 100644
--- a/tools/gpgparsemail.c
+++ b/tools/gpgparsemail.c
@@ -463,7 +463,7 @@ show_event (rfc822parse_event_t event)
/* This function is called by the parser to communicate events. This
callback comminucates with the main program using a structure
- passed in OPAQUE. Should retrun 0 or set errno and return -1. */
+ passed in OPAQUE. Should return 0 or set errno and return -1. */
static int
message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg)
{