diff --git a/checks/armor.test b/checks/armor.test index cfd235969..a23f8d8d2 100755 --- a/checks/armor.test +++ b/checks/armor.test @@ -734,7 +734,7 @@ wg7Md81a5RI3F2FG8747t9gX ' # Bug 1179 solved 2010-05-12: -# It occured for messages of a multiple of the iobuf block size where +# It occurred for messages of a multiple of the iobuf block size where # the last line had no pad character. Due to premature popping of the # armor filter gpg swalled the CRC line and passed the '-----END...' # line on to the decryption layer. diff --git a/cipher/des.c b/cipher/des.c index 670ba6598..7eaa2df8b 100644 --- a/cipher/des.c +++ b/cipher/des.c @@ -104,7 +104,7 @@ * * if ( (error_msg = selftest()) ) * { - * fprintf(stderr, "An error in the DES/Tripple-DES implementation occured: %s\n", error_msg); + * fprintf(stderr, "An error in the DES/Tripple-DES implementation occurred: %s\n", error_msg); * abort(); * } */ diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c index 515b15a6b..6f7c9b294 100644 --- a/g10/ccid-driver.c +++ b/g10/ccid-driver.c @@ -2264,7 +2264,7 @@ ccid_poll (ccid_driver_t handle) } else if (msg[0] == RDR_to_PC_HardwareError) { - DEBUGOUT ("hardware error occured\n"); + DEBUGOUT ("hardware error occurred\n"); } else { diff --git a/g10/pkclist.c b/g10/pkclist.c index 198e3078d..b78070e95 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -952,7 +952,7 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned int use ) } /* Do group expand here too. The trick here is to continue - the loop if any expansion occured. The code above will + the loop if any expansion occurred. The code above will then list all expanded keys. */ if (expand_id(answer,&backlog,0)) continue; diff --git a/util/regcomp.c b/util/regcomp.c index 6964df93e..aafb9c853 100644 --- a/util/regcomp.c +++ b/util/regcomp.c @@ -1764,7 +1764,7 @@ peek_token_bracket (token, input, syntax) /* Entry point of the parser. Parse the regular expression REGEXP and return the structure tree. - If an error is occured, ERR is set by error code, and return NULL. + If an error is occurred, ERR is set by error code, and return NULL. This function build the following tree, from regular expression : CAT / \ @@ -3349,7 +3349,7 @@ build_word_op (dfa, not, err) /* This is intended for the expressions like "a{1,3}". Fetch a number from `input', and return the number. Return -1, if the number field is empty like "{,1}". - Return -2, If an error is occured. */ + Return -2, If an error is occurred. */ static int fetch_number (input, token, syntax) diff --git a/util/regex_internal.c b/util/regex_internal.c index 6f3a96e7d..4349f1b6d 100644 --- a/util/regex_internal.c +++ b/util/regex_internal.c @@ -793,7 +793,7 @@ re_node_set_merge (dest, src) /* Insert the new element ELEM to the re_node_set* SET. return 0 if SET already has ELEM, - return -1 if an error is occured, return 1 otherwise. */ + return -1 if an error is occurred, return 1 otherwise. */ static int re_node_set_insert (set, elem) @@ -909,7 +909,7 @@ re_node_set_remove_at (set, idx) /* Add the token TOKEN to dfa->nodes, and return the index of the token. - Or return -1, if an error will be occured. */ + Or return -1, if an error will be occurred. */ static int re_dfa_add_node (dfa, token, mode)