aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/armor.c2
-rw-r--r--g10/gpg.c2
-rw-r--r--g10/keyedit.c2
-rw-r--r--g10/mainproc.c2
-rw-r--r--g10/pkclist.c4
-rw-r--r--g10/tofu.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/g10/armor.c b/g10/armor.c
index 9e58520a3..55c84258b 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -1436,7 +1436,7 @@ unarmor_pump (UnarmorPump x, int c)
case STA_wait_dash:
x->state = c == '-'? STA_first_dash : STA_wait_newline;
break;
- case STA_first_dash: /* just need for initalization */
+ case STA_first_dash: /* just need for initialization */
x->pos = 0;
x->state = STA_compare_header;
case STA_compare_header:
diff --git a/g10/gpg.c b/g10/gpg.c
index 9f7da050b..2d5b4ffb0 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2704,7 +2704,7 @@ main (int argc, char **argv)
break;
case oRFC4880bis:
opt.flags.rfc4880bis = 1;
- /* fall thru. */
+ /* fall through. */
case oOpenPGP:
case oRFC4880:
/* This is effectively the same as RFC2440, but with
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 25f61ec6a..87e69b0bd 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2767,7 +2767,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
goto leave;
break;
}
- /* fall thru */
+ /* fall through */
case cmdSAVE:
if (modified)
{
diff --git a/g10/mainproc.c b/g10/mainproc.c
index e663af889..f0527bc6e 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -2247,7 +2247,7 @@ proc_tree (CTX c, kbnode_t node)
/* We must skip our special plaintext marker packets here because
they may be the root packet. These packets are only used in
- addional checks and skipping them here doesn't matter. */
+ addtional checks and skipping them here doesn't matter. */
while (node
&& node->pkt->pkttype == PKT_GPG_CONTROL
&& node->pkt->pkt.gpg_control->control == CTRLPKT_PLAINTEXT_MARK)
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 62f5b7f9b..823d67062 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -428,7 +428,7 @@ do_we_trust( PKT_public_key *pk, unsigned int trustlevel )
default:
log_error ("invalid trustlevel %u returned from validation layer\n",
trustlevel);
- /* fall thru */
+ /* fall through */
case TRUST_UNKNOWN:
case TRUST_UNDEFINED:
log_info(_("%s: There is no assurance this key belongs"
@@ -655,7 +655,7 @@ check_signatures_trust (ctrl_t ctrl, PKT_signature *sig)
default:
log_error ("invalid trustlevel %u returned from validation layer\n",
trustlevel);
- /* fall thru */
+ /* fall through */
case TRUST_UNKNOWN:
case TRUST_UNDEFINED:
write_trust_status (STATUS_TRUST_UNDEFINED, trustlevel);
diff --git a/g10/tofu.c b/g10/tofu.c
index e6a3429e3..b78279e25 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2848,7 +2848,7 @@ email_from_user_id (const char *user_id)
TOFU_POLICY_ASK.
This function returns 0 on success and an error code if an error
- occured. */
+ occurred. */
gpg_error_t
tofu_register_signature (ctrl_t ctrl,
PKT_public_key *pk, strlist_t user_id_list,