[git] GPGME - branch, master, updated. gpgme-1.6.0-9-g8c61cbf
by Justus Winter
cvs at cvs.gnupg.org
Wed Dec 2 11:53:33 CET 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, master has been updated
via 8c61cbfb8ff2e1056840ecf8511810ed2482eb1f (commit)
from dfa79f9300b837b0f7f2ea44afa589bfcda1dbd9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8c61cbfb8ff2e1056840ecf8511810ed2482eb1f
Author: Justus Winter <justus at g10code.com>
Date: Wed Dec 2 11:28:07 2015 +0100
Fix typos found by codespell.
--
Signed-off-by: Justus Winter <justus at g10code.com>
diff --git a/src/argparse.c b/src/argparse.c
index 53c20fc..b6abf86 100644
--- a/src/argparse.c
+++ b/src/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/src/funopen.c b/src/funopen.c
index b71d3ae..b722020 100644
--- a/src/funopen.c
+++ b/src/funopen.c
@@ -35,7 +35,7 @@
The functions to provide my either be NULL if not required or
similar to the unistd function with the exception of using the
- cookie instead of the fiel descripor.
+ cookie instead of the file descriptor.
*/
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index e7216cb..8264bab 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -1518,7 +1518,7 @@ typedef enum
GPGME_SIGSUM_CRL_MISSING = 0x0100, /* CRL not available. */
GPGME_SIGSUM_CRL_TOO_OLD = 0x0200, /* Available CRL is too old. */
GPGME_SIGSUM_BAD_POLICY = 0x0400, /* A policy was not met. */
- GPGME_SIGSUM_SYS_ERROR = 0x0800 /* A system error occured. */
+ GPGME_SIGSUM_SYS_ERROR = 0x0800 /* A system error occurred. */
}
gpgme_sigsum_t;
@@ -1610,7 +1610,7 @@ struct _gpgme_import_status
/* Fingerprint. */
char *fpr;
- /* If a problem occured, the reason why the key could not be
+ /* If a problem occurred, the reason why the key could not be
imported. Otherwise GPGME_No_Error. */
gpgme_error_t result;
diff --git a/src/w32-glib-io.c b/src/w32-glib-io.c
index a5af4e6..66dc9bf 100644
--- a/src/w32-glib-io.c
+++ b/src/w32-glib-io.c
@@ -98,7 +98,7 @@ static struct
FD is closed. This, together with the fact that dup'ed file
descriptors are closed before the file descriptors from which
they are dup'ed are closed, ensures that CHAN is always valid,
- and shared among all file descriptors refering to the same
+ and shared among all file descriptors referring to the same
underlying object.
The logic behind this is that there is only one reason for us to
diff --git a/src/w32-io.c b/src/w32-io.c
index a6d5238..8e7abd3 100644
--- a/src/w32-io.c
+++ b/src/w32-io.c
@@ -74,7 +74,7 @@ static struct
that dup'ed file descriptors are closed before the file
descriptors from which they are dup'ed are closed, ensures that
the handle or socket is always valid, and shared among all file
- descriptors refering to the same underlying object.
+ descriptors referring to the same underlying object.
The logic behind this is that there is only one reason for us to
dup file descriptors anyway: to allow simpler book-keeping of
@@ -978,7 +978,7 @@ _gpgme_io_write (int fd, const void *buffer, size_t count)
return TRACE_SYSRES (-1);
}
- /* If no error occured, the number of bytes in the buffer must be
+ /* If no error occurred, the number of bytes in the buffer must be
zero. */
assert (!ctx->nbytes);
diff --git a/src/wait-global.c b/src/wait-global.c
index f03775e..28f3921 100644
--- a/src/wait-global.c
+++ b/src/wait-global.c
@@ -206,7 +206,7 @@ _gpgme_wait_global_event_cb (void *data, gpgme_event_io_t type,
gpgme_error_t err = ctx_active (ctx);
if (err)
- /* An error occured. Close all fds in this context, and
+ /* An error occurred. Close all fds in this context, and
send the error in a done event. */
_gpgme_cancel_with_err (ctx, err, 0);
}
@@ -325,7 +325,7 @@ gpgme_wait_ext (gpgme_ctx_t ctx, gpgme_error_t *status,
err = _gpgme_run_io_cb (&fdt.fds[i], 0, &local_op_err);
if (err || local_op_err)
{
- /* An error occured. Close all fds in this context,
+ /* An error occurred. Close all fds in this context,
and signal it. */
_gpgme_cancel_with_err (ictx, err, local_op_err);
diff --git a/src/wait-private.c b/src/wait-private.c
index 9a43110..12d3180 100644
--- a/src/wait-private.c
+++ b/src/wait-private.c
@@ -89,7 +89,7 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond,
if (nr < 0)
{
- /* An error occured. Close all fds in this context, and
+ /* An error occurred. Close all fds in this context, and
signal it. */
err = gpg_error_from_syserror ();
_gpgme_cancel_with_err (ctx, err, 0);
@@ -116,7 +116,7 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond,
err = _gpgme_run_io_cb (&ctx->fdt.fds[i], 0, &op_err);
if (err)
{
- /* An error occured. Close all fds in this context,
+ /* An error occurred. Close all fds in this context,
and signal it. */
_gpgme_cancel_with_err (ctx, err, 0);
@@ -124,7 +124,7 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond,
}
else if (op_err)
{
- /* An operational error occured. Cancel the current
+ /* An operational error occurred. Cancel the current
operation but not the session, and signal it. */
_gpgme_cancel_with_err (ctx, 0, op_err);
diff --git a/tests/t-data.c b/tests/t-data.c
index 888475f..465f29e 100644
--- a/tests/t-data.c
+++ b/tests/t-data.c
@@ -143,7 +143,7 @@ read_test (round_t round, gpgme_data_t data)
read = gpgme_data_read (data, buffer, sizeof (buffer));
if (read > 0)
{
- fprintf (stderr, "%s:%d: (%i) gpgme_data_read succeded unexpectedly\n",
+ fprintf (stderr, "%s:%d: (%i) gpgme_data_read succeeded unexpectedly\n",
__FILE__, __LINE__, round);
exit (1);
}
-----------------------------------------------------------------------
Summary of changes:
src/argparse.c | 2 +-
src/funopen.c | 2 +-
src/gpgme.h.in | 4 ++--
src/w32-glib-io.c | 2 +-
src/w32-io.c | 4 ++--
src/wait-global.c | 4 ++--
src/wait-private.c | 6 +++---
tests/t-data.c | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list