From bb5a9f8e451bc206e78c9d4d03eb4cbdbef260b3 Mon Sep 17 00:00:00 2001 From: Alexander Moisseev Date: Tue, 27 Jun 2017 10:44:19 +0300 Subject: [PATCH] [Minor] Massive spelling correction by a bot https://github.com/ka7/misspell_fixer --- ChangeLog | 22 +++++++++---------- conf/metrics.conf | 4 ++-- conf/modules.d/ip_score.conf | 2 +- config.h.in | 2 +- contrib/exim/local_scan.c | 2 +- contrib/exim/local_scan.c.in | 2 +- contrib/exim/patch-exim-src_spam.c.diff | 2 +- .../patch-exim-src_spam.c.diff.exim-4.85.diff | 2 +- contrib/hiredis/sds.c | 2 +- contrib/http-parser/http_parser.c | 6 ++--- contrib/lc-btrie/btrie.c | 4 ++-- contrib/lgpl/gregex.c | 18 +++++++-------- contrib/libottery/ottery-internal.h | 2 +- contrib/libucl/lua_ucl.c | 2 +- contrib/libucl/ucl.h | 18 +++++++-------- contrib/libucl/ucl_util.c | 2 +- contrib/lpeg/lpcode.c | 8 +++---- contrib/lpeg/lptree.c | 6 ++--- contrib/mumhash/mum.h | 8 +++---- contrib/xxhash/xxhash.c | 4 ++-- contrib/zstd/cover.c | 4 ++-- doc/doxydown/README.md | 2 +- doc/doxydown/doxydown.pl | 2 +- rules/mid.lua | 2 +- rules/regexp/upstream_spam_filters.lua | 2 +- src/fuzzy_storage.c | 4 ++-- src/libcryptobox/blake2/blake2.c | 2 +- src/libcryptobox/chacha20/chacha.c | 2 +- src/libcryptobox/cryptobox.h | 6 ++--- src/libcryptobox/poly1305/poly1305.c | 2 +- src/libcryptobox/siphash/siphash.c | 2 +- src/libmime/filter.h | 2 +- src/libserver/cfg_file.h | 2 +- src/libserver/cfg_rcl.h | 2 +- src/libserver/html_tags.h | 2 +- src/libserver/spf.c | 2 +- src/libserver/symbols_cache.h | 2 +- src/libserver/task.h | 4 ++-- src/libutil/addr.h | 4 ++-- src/libutil/fstring.c | 2 +- src/libutil/fstring.h | 2 +- src/libutil/http.h | 2 +- src/libutil/logger.c | 4 ++-- src/libutil/map.c | 2 +- src/libutil/mem_pool.h | 4 ++-- src/libutil/multipattern.h | 2 +- src/libutil/printf.h | 2 +- src/libutil/radix.h | 2 +- src/libutil/str_util.h | 2 +- src/lua/lua_cfg_file.c | 4 ++-- src/lua/lua_config.c | 12 +++++----- src/lua/lua_html.c | 2 +- src/lua/lua_http.c | 2 +- src/lua/lua_mimepart.c | 2 +- src/lua/lua_task.c | 10 ++++----- src/lua/lua_util.c | 2 +- src/lua/rspamd.luadoc | 2 +- src/lua_worker.c | 2 +- src/plugins/fuzzy_check.c | 2 +- src/plugins/lua/dmarc.lua | 2 +- src/plugins/lua/maillist.lua | 2 +- src/plugins/lua/settings.lua | 4 ++-- src/plugins/lua/spamassassin.lua | 2 +- src/worker_private.h | 2 +- test/lua/telescope.lua | 4 ++-- test/lua/unit/expressions.lua | 2 +- utils/fann_train.pl | 2 +- utils/rspamd_stats.pl | 2 +- 68 files changed, 127 insertions(+), 127 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8d829418..9055d1f9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1411,7 +1411,7 @@ * [Feature] Add replies plugin * [Feature] Add results parsing code * [Feature] Add routines to compare and check pubkeys - * [Feature] Add simplier versions of refcounts + * [Feature] Add simpler versions of refcounts * [Feature] Add some time manipulation functions for lua APi * [Feature] Add support for non-standard BATV signatures * [Feature] Add support of address with at-domain list @@ -1511,7 +1511,7 @@ * [Feature] Implement zero-copy mode for HTTP reading * [Feature] Improve SPF domain detection logic * [Feature] Improve config:register_symbol function - * [Feature] Improve error report for type missmatch in lua + * [Feature] Improve error report for type mismatch in lua * [Feature] Improve fstrings API * [Feature] Improve getting SMTP data from lua_task * [Feature] Improve levenshtein distance function @@ -2105,7 +2105,7 @@ - Fix html images rules to reduce FP rates * New rules: - LONG_SUBJ - too long subject - - MIME_BAD_ATTACHMENT - bad attachement type + - MIME_BAD_ATTACHMENT - bad attachment type - RDNS_NONE - no reverse DNS record for sender's IP - Fix MISSING_MIMEOLE rule for modern OE * Many other bugfixes, memory leaks plugs thanks to: @@ -2553,7 +2553,7 @@ * Cache correct passwords to avoid too high CPU usage when working with webui * Controller sockets are owned by router do not export them to task * Optimize logging by skipping hash table search if it's empty - * Fix loading issue whith broken statfiles + * Fix loading issue with broken statfiles * Print assertions from glib to rspamd logger * Load legacy `lua/rspamd.local.lua` * Update webui with some fixes to learning and scanning @@ -2777,7 +2777,7 @@ - aggressive optimizations based on the abstract syntax tree; - abstract expressions support (regular expressions, functions, lua modules composites and so on) - - New comparision and '+' operators support + - New comparison and '+' operators support - New greedy algorithm to minimize execution time of expressions and all symbols - Dynamic expressions benchmark and reoptimizations @@ -2951,7 +2951,7 @@ - converted to UTF-8 - normalized if needed (e.g. HTML tags are stripped) * Rework DKIM canonization to line based - * Fix fuzzy hashes addding + * Fix fuzzy hashes adding * Use more specific hash function for fuzzy * Fix leaking of iconv descriptors * Fix PTR resolving in lua resolver @@ -3000,7 +3000,7 @@ - Free IP list on upstream destruction - Add test cases for addresses selection - Allow adding of free form IP addresses to upstreams - * Fix endiannes in lua_radix search (reported by @citrin) + * Fix endianness in lua_radix search (reported by @citrin) * Soft shutdown should also set wanna_die flag (reported by @citrin) * Stop use-after-free in event loop termination * Fix processing of very short messages in DKIM (reported by @citrin) @@ -3305,7 +3305,7 @@ * Do not output control characters if output is not terminal * Fix some logic errors in learning * Consider lua plugins errors as fatal configuration errors - * Fix wirting message id during fuzzy_add command + * Fix writing message id during fuzzy_add command * Display weight of symbols correctly * Fixes to winnow learning * One more try to improve accuracy of winnow algorithm @@ -3330,7 +3330,7 @@ * Add ability to set minimum dimensions for images * Assume all text/* content types as text/plain * Fix getting data wrapper for gmime24 - * Many fixes to statfile syncronization system + * Many fixes to statfile synchronization system * Fixed statfile pool initialization and synchronization with disk * Prepare 0.3.2 * Fix Mail::Rspamd::Config for new rspamd features @@ -3483,7 +3483,7 @@ * Make valgrind happy about comparing symbols * Add more debug to comparing parts distance function * Write action even if message has no symbols - * Make improvements to HTML entites decoder: now it replaces entities with common characters and + * Make improvements to HTML entities decoder: now it replaces entities with common characters and * Add -d option to force debug output * Assume 7bit as default transfer encoding * Do not overwrite lua plugins and configs if they already exists in target directory @@ -3508,7 +3508,7 @@ * Stupid error in calculation compressed label length * Some optimizations to client library * Do not compare empty parts - * Empty and non-empty parts are allways different + * Empty and non-empty parts are always different * Save in regexp cache the whole regexp with header name (if exists) and with flags * Add rspamd_log variable to lua plugins to access logging functions * Each part in rspamd task now can have parent part diff --git a/conf/metrics.conf b/conf/metrics.conf index e07b0f619..222f790a0 100644 --- a/conf/metrics.conf +++ b/conf/metrics.conf @@ -535,7 +535,7 @@ metric { } symbol "HFILTER_RCPT_BOUNCEMOREONE" { weight = 1.50; - description = "Message from bounce and over 1 recepient"; + description = "Message from bounce and over 1 recipient"; } symbol "HFILTER_URL_ONLY" { weight = 2.20; @@ -588,7 +588,7 @@ metric { } symbol "MIME_BAD_ATTACHMENT" { weight = 4.0; - description = "Invalid attachement mime type"; + description = "Invalid attachment mime type"; one_shot = true; } symbol "MIME_ENCRYPTED_ARCHIVE" { diff --git a/conf/modules.d/ip_score.conf b/conf/modules.d/ip_score.conf index 67deda38a..16a4f7686 100644 --- a/conf/modules.d/ip_score.conf +++ b/conf/modules.d/ip_score.conf @@ -15,7 +15,7 @@ ip_score { # servers = "localhost"; -# treshold = 100; +# threshold = 100; # reject_score = 3; # no_action_score = -2; # add_header_score = 1; diff --git a/config.h.in b/config.h.in index 9e2ccb9fd..d51af0e2f 100644 --- a/config.h.in +++ b/config.h.in @@ -143,7 +143,7 @@ #define HAVE_EVUTIL_RNG_INIT 1 #endif -/* Detect endiannes */ +/* Detect endianness */ #ifdef HAVE_ENDIAN_H #include diff --git a/contrib/exim/local_scan.c b/contrib/exim/local_scan.c index 3277bd879..522750144 100644 --- a/contrib/exim/local_scan.c +++ b/contrib/exim/local_scan.c @@ -280,7 +280,7 @@ int GetFiles (char *pInpFile, int local_scan_fd) { /* Returns OK if no errors, else error code. - On succesful return, pEnvFile points to Envelope file name and + On successful return, pEnvFile points to Envelope file name and pInpFile points to Message filename */ int iStatus; diff --git a/contrib/exim/local_scan.c.in b/contrib/exim/local_scan.c.in index 68eec62cd..72d2f7988 100644 --- a/contrib/exim/local_scan.c.in +++ b/contrib/exim/local_scan.c.in @@ -267,7 +267,7 @@ local_scan(int fd, uschar **return_text) tok_ptr = reply_buf; /* - * rspamd can use several metrics, logic implimented here: + * rspamd can use several metrics, logic implemented here: * if any metric more than reject_score - will reject * if any metric true - message will be marked as spam */ diff --git a/contrib/exim/patch-exim-src_spam.c.diff b/contrib/exim/patch-exim-src_spam.c.diff index de507f0e7..f3ac788d4 100644 --- a/contrib/exim/patch-exim-src_spam.c.diff +++ b/contrib/exim/patch-exim-src_spam.c.diff @@ -171,7 +171,7 @@ diff -ru exim-4.70.orig/src/spam.c exim-4.70/src/spam.c + } /* now send the file */ - /* spamd sometimes accepts conections but doesn't read data off + /* spamd sometimes accepts connections but doesn't read data off @@ -304,7 +359,9 @@ (void)fclose(mbox_file); diff --git a/contrib/exim/patch-exim-src_spam.c.diff.exim-4.85.diff b/contrib/exim/patch-exim-src_spam.c.diff.exim-4.85.diff index 471865368..0389aeabc 100644 --- a/contrib/exim/patch-exim-src_spam.c.diff.exim-4.85.diff +++ b/contrib/exim/patch-exim-src_spam.c.diff.exim-4.85.diff @@ -174,7 +174,7 @@ diff -ru exim-4.85.orig/src/spam.c exim-4.85/src/spam.c + } /* now send the file */ - /* spamd sometimes accepts conections but doesn't read data off + /* spamd sometimes accepts connections but doesn't read data off @@ -349,60 +404,93 @@ /* reading done */ (void)close(spamd_sock); diff --git a/contrib/hiredis/sds.c b/contrib/hiredis/sds.c index f01247de9..5e7551647 100644 --- a/contrib/hiredis/sds.c +++ b/contrib/hiredis/sds.c @@ -161,7 +161,7 @@ sds sdsRemoveFreeSpace(sds s) { return sh->buf; } -/* Return the total size of the allocation of the specifed sds string, +/* Return the total size of the allocation of the specified sds string, * including: * 1) The sds header before the pointer. * 2) The string. diff --git a/contrib/http-parser/http_parser.c b/contrib/http-parser/http_parser.c index 2984471d4..0e75d964b 100644 --- a/contrib/http-parser/http_parser.c +++ b/contrib/http-parser/http_parser.c @@ -1653,7 +1653,7 @@ size_t http_parser_execute (http_parser *parser, /* Here we call the headers_complete callback. This is somewhat * different than other callbacks because if the user returns 1, we * will interpret that as saying that this message has no body. This - * is needed for the annoying case of recieving a response to a HEAD + * is needed for the annoying case of receiving a response to a HEAD * request. * * We'd like to use CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so @@ -1733,7 +1733,7 @@ size_t http_parser_execute (http_parser *parser, && parser->content_length != ULLONG_MAX); /* The difference between advancing content_length and p is because - * the latter will automaticaly advance on the next loop iteration. + * the latter will automatically advance on the next loop iteration. * Further, if content_length ends up at 0, we want to see the last * byte again for our message complete callback. */ @@ -2162,7 +2162,7 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect, case s_dead: return 1; - /* Skip delimeters */ + /* Skip delimiters */ case s_req_schema_slash: case s_req_schema_slash_slash: case s_req_server_start: diff --git a/contrib/lc-btrie/btrie.c b/contrib/lc-btrie/btrie.c index 51357a1d6..fe768fc56 100644 --- a/contrib/lc-btrie/btrie.c +++ b/contrib/lc-btrie/btrie.c @@ -168,7 +168,7 @@ * array of children for that path can be found by counting the number * of set bits to the left of that bit. * - * Similary, the internal bitmap has one bit for each binary node + * Similarly, the internal bitmap has one bit for each binary node * which is internal to the multibit node. To determine whether there * is data stored for an internal prefix, one checks the corresponding * bit in the internal bitmap. As for extending paths, the index into @@ -946,7 +946,7 @@ static void coalesce_lc_node(struct btrie *btrie, struct lc_node *node, btrie->n_lc_nodes--; } else { - /* can't merge, but can take some of childs bits */ + /* can't merge, but can take some of children bits */ unsigned cshift = lc_shift (end + spare_bits) - lc_shift (end); memcpy(node->prefix + shift, child->prefix, diff --git a/contrib/lgpl/gregex.c b/contrib/lgpl/gregex.c index 406a63975..864888ad8 100644 --- a/contrib/lgpl/gregex.c +++ b/contrib/lgpl/gregex.c @@ -470,7 +470,7 @@ g_match_info_free (GMatchInfo *match_info) /** * g_match_info_next: * @match_info: a #GMatchInfo structure - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Scans for the next match using the same parameters of the previous * call to g_regex_match_full() or g_regex_match() that returned @@ -534,7 +534,7 @@ g_match_info_next (GMatchInfo *match_info, match_info->pos = match_info->offsets[1]; } - /* it's possibile to get two identical matches when we are matching + /* it's possible to get two identical matches when we are matching * empty strings, for instance if the pattern is "(?=[A-Z0-9])" and * the string is "RegExTest" we have: * - search at position 0: match from 0 to 0 @@ -661,7 +661,7 @@ g_match_info_is_partial_match (const GMatchInfo *match_info) * g_match_info_expand_references: * @match_info: a #GMatchInfo or %NULL * @string_to_expand: the string to expand - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Returns a new string containing the text in @string_to_expand with * references and escape sequences expanded. References refer to the last @@ -1403,7 +1403,7 @@ g_regex_match (const GRegex *regex, * @match_options: match options * @match_info: pointer to location where to store the #GMatchInfo, * or %NULL if you do not need it - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Scans for a match in string for the pattern in @regex. * The @match_options are combined with the match options specified @@ -1534,10 +1534,10 @@ g_regex_match_all (const GRegex *regex, * @match_options: match options * @match_info: pointer to location where to store the #GMatchInfo, * or %NULL if you do not need it - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Using the standard algorithm for regular expression matching only - * the longest match in the string is retrieved, it is not possibile + * the longest match in the string is retrieved, it is not possible * to obtain all the available matches. For instance matching * "<a> <b> <c>" against the pattern "<.*>" * you get "<a> <b> <c>". @@ -2402,7 +2402,7 @@ interpolation_list_needs_match (GList *list) * @start_position: starting index of the string to match * @replacement: text to replace each match with * @match_options: options for the match - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Replaces all occurrences of the pattern in @regex with the * replacement text. Backreferences of the form '\number' or @@ -2514,7 +2514,7 @@ literal_replacement (const GMatchInfo *match_info, * @start_position: starting index of the string to match * @replacement: text to replace each match with * @match_options: options for the match - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Replaces all occurrences of the pattern in @regex with the * replacement text. @replacement is replaced literally, to @@ -2558,7 +2558,7 @@ g_regex_replace_literal (const GRegex *regex, * @match_options: options for the match * @eval: a function to call for each match * @user_data: user data to pass to the function - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Replaces occurrences of the pattern in regex with the output of * @eval for that occurrence. diff --git a/contrib/libottery/ottery-internal.h b/contrib/libottery/ottery-internal.h index 145c5e4a9..2c38a52b0 100644 --- a/contrib/libottery/ottery-internal.h +++ b/contrib/libottery/ottery-internal.h @@ -170,7 +170,7 @@ struct ottery_prf { unsigned output_len; /** Bitmask of CPU flags required to run this PRF. */ uint32_t required_cpucap; - /** Pointer to a function to intialize a state structure for the PRF. + /** Pointer to a function to initialize a state structure for the PRF. * * @param state An object of size at least (state_len) that will * hold the state and any derived values. It must be aligned to diff --git a/contrib/libucl/lua_ucl.c b/contrib/libucl/lua_ucl.c index 0d6cc0830..85f16a237 100644 --- a/contrib/libucl/lua_ucl.c +++ b/contrib/libucl/lua_ucl.c @@ -1186,7 +1186,7 @@ lua_ucl_to_config (lua_State *L) * - `yaml` - embedded yaml * * If `var` contains function, they are called during output formatting and if - * they return string value, then this value is used for ouptut. + * they return string value, then this value is used for output. * @param {variant} var any sort of lua variable (if userdata then metafield `__to_ucl` is searched for output) * @param {string} format any available format * @return {string} string representation of `var` in the specific `format`. diff --git a/contrib/libucl/ucl.h b/contrib/libucl/ucl.h index ee03334e0..7c069e794 100644 --- a/contrib/libucl/ucl.h +++ b/contrib/libucl/ucl.h @@ -108,7 +108,7 @@ typedef enum ucl_error { UCL_EMACRO, /**< Error processing a macro */ UCL_EINTERNAL, /**< Internal unclassified error */ UCL_ESSL, /**< SSL error */ - UCL_EMERGE /**< A merge error occured */ + UCL_EMERGE /**< A merge error occurred */ } ucl_error_t; /** @@ -229,7 +229,7 @@ typedef struct ucl_object_s { const char *key; /**< Key of an object */ struct ucl_object_s *next; /**< Array handle */ struct ucl_object_s *prev; /**< Array handle */ - uint32_t keylen; /**< Lenght of a key */ + uint32_t keylen; /**< Length of a key */ uint32_t len; /**< Size of an object */ uint32_t ref; /**< Reference count */ uint16_t flags; /**< Object flags */ @@ -830,7 +830,7 @@ UCL_EXTERN ucl_object_iter_t ucl_object_iterate_reset (ucl_object_iter_t it, const ucl_object_t *obj); /** - * Get the next object from the `obj`. This fucntion iterates over arrays, objects + * Get the next object from the `obj`. This function iterates over arrays, objects * and implicit arrays * @param iter safe iterator * @param expand_values expand explicit arrays and objects @@ -848,7 +848,7 @@ enum ucl_iterate_type { }; /** - * Get the next object from the `obj`. This fucntion iterates over arrays, objects + * Get the next object from the `obj`. This function iterates over arrays, objects * and implicit arrays if needed * @param iter safe iterator * @param @@ -1156,7 +1156,7 @@ UCL_EXTERN const ucl_object_t * ucl_comments_find (const ucl_object_t *comments, * Move comment from `from` object to `to` object * @param comments comments object * @param what source object - * @param whith destination object + * @param with destination object * @return `true` if `from` has comment and it has been moved to `to` */ UCL_EXTERN bool ucl_comments_move (ucl_object_t *comments, @@ -1391,7 +1391,7 @@ enum ucl_schema_error_code { struct ucl_schema_error { enum ucl_schema_error_code code; /**< error code */ char msg[128]; /**< error message */ - const ucl_object_t *obj; /**< object where error occured */ + const ucl_object_t *obj; /**< object where error occurred */ }; /** @@ -1399,7 +1399,7 @@ struct ucl_schema_error { * @param schema schema object * @param obj object to validate * @param err error pointer, if this parameter is not NULL and error has been - * occured, then `err` is filled with the exact error definition. + * occurred, then `err` is filled with the exact error definition. * @return true if `obj` is valid using `schema` */ UCL_EXTERN bool ucl_object_validate (const ucl_object_t *schema, @@ -1411,7 +1411,7 @@ UCL_EXTERN bool ucl_object_validate (const ucl_object_t *schema, * @param obj object to validate * @param root root schema object * @param err error pointer, if this parameter is not NULL and error has been - * occured, then `err` is filled with the exact error definition. + * occurred, then `err` is filled with the exact error definition. * @return true if `obj` is valid using `schema` */ UCL_EXTERN bool ucl_object_validate_root (const ucl_object_t *schema, @@ -1427,7 +1427,7 @@ UCL_EXTERN bool ucl_object_validate_root (const ucl_object_t *schema, * @param root root schema object * @param ext_refs external references (might be modified during validation) * @param err error pointer, if this parameter is not NULL and error has been - * occured, then `err` is filled with the exact error definition. + * occurred, then `err` is filled with the exact error definition. * @return true if `obj` is valid using `schema` */ UCL_EXTERN bool ucl_object_validate_root_ext (const ucl_object_t *schema, diff --git a/contrib/libucl/ucl_util.c b/contrib/libucl/ucl_util.c index 812655d2e..f0ce5b5e3 100644 --- a/contrib/libucl/ucl_util.c +++ b/contrib/libucl/ucl_util.c @@ -3070,7 +3070,7 @@ ucl_object_todouble_safe (const ucl_object_t *obj, double *target) } switch (obj->type) { case UCL_INT: - *target = obj->value.iv; /* Probaly could cause overflow */ + *target = obj->value.iv; /* Probably could cause overflow */ break; case UCL_FLOAT: case UCL_TIME: diff --git a/contrib/lpeg/lpcode.c b/contrib/lpeg/lpcode.c index fbf44feb1..6feefeb43 100644 --- a/contrib/lpeg/lpcode.c +++ b/contrib/lpeg/lpcode.c @@ -248,7 +248,7 @@ int fixedlenx (TTree *tree, int count, int len) { /* ** Computes the 'first set' of a pattern. -** The result is a conservative aproximation: +** The result is a conservative approximation: ** match p ax -> x (for some x) ==> a belongs to first(p) ** or ** a not in first(p) ==> match p ax -> fail (for all x) @@ -737,13 +737,13 @@ static void coderuntime (CompileState *compst, TTree *tree, int tt) { /* -** Repetion; optimizations: +** Repetition; optimizations: ** When pattern is a charset, can use special instruction ISpan. ** When pattern is head fail, or if it starts with characters that ** are disjoint from what follows the repetions, a simple test ** is enough (a fail inside the repetition would backtrack to fail ** again in the following pattern, so there is no need for a choice). -** When 'opt' is true, the repetion can reuse the Choice already +** When 'opt' is true, the repetition can reuse the Choice already ** active in the stack. */ static void coderep (CompileState *compst, TTree *tree, int opt, @@ -884,7 +884,7 @@ static int codeseq1 (CompileState *compst, TTree *p1, TTree *p2, /* -** Main code-generation function: dispatch to auxiliar functions +** Main code-generation function: dispatch to auxiliary functions ** according to kind of tree. ('needfollow' should return true ** only for consructions that use 'fl'.) */ diff --git a/contrib/lpeg/lptree.c b/contrib/lpeg/lptree.c index bc82ae8da..f1016c3db 100644 --- a/contrib/lpeg/lptree.c +++ b/contrib/lpeg/lptree.c @@ -186,7 +186,7 @@ static int ktablelen (lua_State *L, int idx) { /* -** Concatentate the contents of table 'idx1' into table 'idx2'. +** Concatenate the contents of table 'idx1' into table 'idx2'. ** (Assume that both indices are negative.) ** Return the original length of table 'idx2' (or 0, if no ** element was added, as there is no need to correct any index). @@ -484,7 +484,7 @@ static TTree *getpatt (lua_State *L, int idx, int *len) { /* -** create a new tree, whith a new root and one sibling. +** create a new tree, with a new root and one sibling. ** Sibling must be on the Lua stack, at index 1. */ static TTree *newroot1sib (lua_State *L, int tag) { @@ -499,7 +499,7 @@ static TTree *newroot1sib (lua_State *L, int tag) { /* -** create a new tree, whith a new root and 2 siblings. +** create a new tree, with a new root and 2 siblings. ** Siblings must be on the Lua stack, first one at index 1. */ static TTree *newroot2sib (lua_State *L, int tag) { diff --git a/contrib/mumhash/mum.h b/contrib/mumhash/mum.h index 6b9fac4a8..c6985a282 100644 --- a/contrib/mumhash/mum.h +++ b/contrib/mumhash/mum.h @@ -35,7 +35,7 @@ Random and Pseudorandom Number Generators for Cryptographic Applications (version 2.2.1) with 1000 bitstreams each containing 1M bits. MUM hashing is also faster Spooky64 and City64 on small - strings (at least upto 512-bit) on Haswell and Power7. The MUM bulk + strings (at least up to 512-bit) on Has well and Power7. The MUM bulk speed (speed on very long data) is bigger than Spooky and City on Power7. On Haswell the bulk speed is bigger than Spooky one and close to City speed. */ @@ -174,7 +174,7 @@ _mum_le (uint64_t v) { #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ return _mum_bswap64 (v); #else -#error "Unknown endianess" +#error "Unknown endianness" #endif } @@ -185,7 +185,7 @@ _mum_le32 (uint32_t v) { #elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ return _mum_bswap32 (v); #else -#error "Unknown endianess" +#error "Unknown endianness" #endif } @@ -383,7 +383,7 @@ mum_hash64 (uint64_t key, uint64_t seed) { } /* Hash data KEY of length LEN and SEED. The hash depends on the - target endianess and the unroll factor. */ + target endianness and the unroll factor. */ static inline uint64_t _MUM_INLINE mum_hash (const void *key, size_t len, uint64_t seed) { return _mum_hash_default (key, len, seed); diff --git a/contrib/xxhash/xxhash.c b/contrib/xxhash/xxhash.c index db72061dc..86abd5eab 100644 --- a/contrib/xxhash/xxhash.c +++ b/contrib/xxhash/xxhash.c @@ -51,10 +51,10 @@ You can contact the author at : // #define XXH_ACCEPT_NULL_INPUT_POINTER 1 // XXH_FORCE_NATIVE_FORMAT : -// By default, xxHash library provides endian-independant Hash values, based on little-endian convention. +// By default, xxHash library provides endian-independent Hash values, based on little-endian convention. // Results are therefore identical for little-endian and big-endian CPU. // This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format. -// Should endian-independance be of no importance for your application, you may set the #define below to 1. +// Should endian-independence be of no importance for your application, you may set the #define below to 1. // It will improve speed for Big-endian CPU. // This option has no impact on Little_Endian CPU. #define XXH_FORCE_NATIVE_FORMAT 0 diff --git a/contrib/zstd/cover.c b/contrib/zstd/cover.c index 1863c8f34..0f9622898 100644 --- a/contrib/zstd/cover.c +++ b/contrib/zstd/cover.c @@ -437,7 +437,7 @@ static COVER_segment_t COVER_selectSegment(const COVER_ctx_t *ctx, U32 *freqs, U32 *delDmerOcc = COVER_map_at(activeDmers, delDmer); activeSegment.begin += 1; *delDmerOcc -= 1; - /* If this is the last occurence of the dmer, subtract its score */ + /* If this is the last occurrence of the dmer, subtract its score */ if (*delDmerOcc == 0) { COVER_map_remove(activeDmers, delDmer); activeSegment.score -= freqs[delDmer]; @@ -834,7 +834,7 @@ typedef struct COVER_tryParameters_data_s { } COVER_tryParameters_data_t; /** - * Tries a set of parameters and upates the COVER_best_t with the results. + * Tries a set of parameters and updates the COVER_best_t with the results. * This function is thread safe if zstd is compiled with multithreaded support. * It takes its parameters as an *OWNING* opaque pointer to support threading. */ diff --git a/doc/doxydown/README.md b/doc/doxydown/README.md index fb3f9f14b..86d4c30c2 100644 --- a/doc/doxydown/README.md +++ b/doc/doxydown/README.md @@ -24,7 +24,7 @@ man pages and many others). Doxydown is extremely simple as it can output markdown only but it is very convenient tool to generate nice markdown with all features required from the documentation system. Doxydown uses input format that is very close to `doxygen` -that allows to re-use the existing documentation comments. Currenly, doxydown +that allows to re-use the existing documentation comments. Currently, doxydown does not support many features but they could be easily added on demand. ## Input format diff --git a/doc/doxydown/doxydown.pl b/doc/doxydown/doxydown.pl index 1b543cf36..45a11ba13 100755 --- a/doc/doxydown/doxydown.pl +++ b/doc/doxydown/doxydown.pl @@ -547,7 +547,7 @@ if ( !$language ) { $language = $languages{c}; } -## TODO: select language based on file extention +## TODO: select language based on file extension ## TODO: change calling structure to allow looping through directory use constant { diff --git a/rules/mid.lua b/rules/mid.lua index 337fbde86..9fd4df555 100644 --- a/rules/mid.lua +++ b/rules/mid.lua @@ -34,7 +34,7 @@ local function mid_check_func(task) if mid:find("@%[%d+%.%d+%.%d+%.%d+%]") then task:insert_result('MID_RHS_IP_LITERAL', 1.0) end - -- Check From address atrributes against MID + -- Check From address attributes against MID local from = task:get_from(2) if (from and from[1] and from[1].domain and from[1].domain ~= '') then local fd = from[1].domain:lower() diff --git a/rules/regexp/upstream_spam_filters.lua b/rules/regexp/upstream_spam_filters.lua index f778ae3a8..be792a318 100644 --- a/rules/regexp/upstream_spam_filters.lua +++ b/rules/regexp/upstream_spam_filters.lua @@ -29,7 +29,7 @@ reconf['MICROSOFT_SPAM'] = { -- https://technet.microsoft.com/en-us/library/dn205071(v=exchg.150).aspx re = 'X-Forefront-Antispam-Report=/SFV:SPM/H', score = 10, - description = "Microsoft says the messge is spam", + description = "Microsoft says the message is spam", group = 'upstream_spam_filters' } diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c index 6ffecf093..8170b2810 100644 --- a/src/fuzzy_storage.c +++ b/src/fuzzy_storage.c @@ -97,9 +97,9 @@ struct fuzzy_global_stat { guint64 fuzzy_hashes_expired; /**< number of fuzzy hashes expired */ guint64 fuzzy_hashes_checked[RSPAMD_FUZZY_EPOCH_MAX]; - /**< ammount of check requests for each epoch */ + /**< amount of check requests for each epoch */ guint64 fuzzy_shingles_checked[RSPAMD_FUZZY_EPOCH_MAX]; - /**< ammount of shingle check requests for each epoch */ + /**< amount of shingle check requests for each epoch */ guint64 fuzzy_hashes_found[RSPAMD_FUZZY_EPOCH_MAX]; /**< amount of hashes found by epoch */ guint64 invalid_requests; diff --git a/src/libcryptobox/blake2/blake2.c b/src/libcryptobox/blake2/blake2.c index fd99a0f93..bb681b5d3 100644 --- a/src/libcryptobox/blake2/blake2.c +++ b/src/libcryptobox/blake2/blake2.c @@ -64,7 +64,7 @@ BLAKE2B_DECLARE(x86) BLAKE2B_DECLARE(ref) #define BLAKE2B_GENERIC BLAKE2B_IMPL(0, "generic", ref) -/* list implemenations from most optimized to least, with generic as the last entry */ +/* list implementations from most optimized to least, with generic as the last entry */ static const blake2b_impl_t blake2b_list[] = { BLAKE2B_GENERIC, #if defined(BLAKE2B_AVX) diff --git a/src/libcryptobox/chacha20/chacha.c b/src/libcryptobox/chacha20/chacha.c index 4bb2098a3..fad83e823 100644 --- a/src/libcryptobox/chacha20/chacha.c +++ b/src/libcryptobox/chacha20/chacha.c @@ -117,7 +117,7 @@ void chacha_init (chacha_state *S, const chacha_key *key, state->leftover = 0; } -/* processes inlen bytes (can do partial blocks), handling input/ouput alignment */ +/* processes inlen bytes (can do partial blocks), handling input/output alignment */ static void chacha_consume (chacha_state_internal *state, const unsigned char *in, unsigned char *out, size_t inlen) diff --git a/src/libcryptobox/cryptobox.h b/src/libcryptobox/cryptobox.h index a5a27f403..5637c3468 100644 --- a/src/libcryptobox/cryptobox.h +++ b/src/libcryptobox/cryptobox.h @@ -127,7 +127,7 @@ void rspamd_cryptobox_encryptv_inplace (struct rspamd_cryptobox_segment *segment /** * Decrypt and verify data chunk inplace * @param data data to decrypt - * @param len lenght of data + * @param len length of data * @param pk remote pubkey * @param sk local privkey * @param sig signature input @@ -169,7 +169,7 @@ void rspamd_cryptobox_encryptv_nm_inplace (struct rspamd_cryptobox_segment *segm /** * Decrypt and verify data chunk inplace * @param data data to decrypt - * @param len lenght of data + * @param len length of data * @param pk remote pubkey * @param sk local privkey * @param sig signature input @@ -207,7 +207,7 @@ void rspamd_cryptobox_sign (guchar *sig, gsize *siglen_p, * pubkey * @param sig signature source * @param m input message - * @param mlen message lenght + * @param mlen message length * @param pk public key for verification * @return true if signature is valid, false otherwise */ diff --git a/src/libcryptobox/poly1305/poly1305.c b/src/libcryptobox/poly1305/poly1305.c index 9e1eed04e..4adea30af 100644 --- a/src/libcryptobox/poly1305/poly1305.c +++ b/src/libcryptobox/poly1305/poly1305.c @@ -77,7 +77,7 @@ POLY1305_DECLARE(sse2) POLY1305_DECLARE(ref) #define POLY1305_GENERIC POLY1305_IMPL(0, "generic", ref) -/* list implemenations from most optimized to least, with generic as the last entry */ +/* list implementations from most optimized to least, with generic as the last entry */ static const poly1305_impl_t poly1305_list[] = { POLY1305_GENERIC, diff --git a/src/libcryptobox/siphash/siphash.c b/src/libcryptobox/siphash/siphash.c index 7c5941a35..0c91ff7ab 100644 --- a/src/libcryptobox/siphash/siphash.c +++ b/src/libcryptobox/siphash/siphash.c @@ -48,7 +48,7 @@ SIPHASH_DECLARE(avx2) #define SIPHASH_AVX2 SIPHASH_IMPL(CPUID_AVX2, "avx2", avx2) #endif -/* list implemenations from most optimized to least, with generic as the last entry */ +/* list implementations from most optimized to least, with generic as the last entry */ static const siphash_impl_t siphash_list[] = { SIPHASH_GENERIC, #if defined(SIPHASH_AVX2) diff --git a/src/libmime/filter.h b/src/libmime/filter.h index 49904962f..9a4379fab 100644 --- a/src/libmime/filter.h +++ b/src/libmime/filter.h @@ -1,6 +1,6 @@ /** * @file filter.h - * Filters logic implemetation + * Filters logic implementation */ #ifndef RSPAMD_FILTER_H diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h index 3c5fe93fb..e48eb6db0 100644 --- a/src/libserver/cfg_file.h +++ b/src/libserver/cfg_file.h @@ -189,7 +189,7 @@ struct rspamd_worker_conf { GQuark type; /**< type of worker */ struct rspamd_worker_bind_conf *bind_conf; /**< bind configuration */ guint16 count; /**< number of workers */ - GList *listen_socks; /**< listening sockets desctiptors */ + GList *listen_socks; /**< listening sockets descriptors */ guint32 rlimit_nofile; /**< max files limit */ guint32 rlimit_maxcore; /**< maximum core file size */ GHashTable *params; /**< params for worker */ diff --git a/src/libserver/cfg_rcl.h b/src/libserver/cfg_rcl.h index d1ec26b2b..e115fda97 100644 --- a/src/libserver/cfg_rcl.h +++ b/src/libserver/cfg_rcl.h @@ -408,7 +408,7 @@ ucl_object_t *rspamd_rcl_add_doc_obj (ucl_object_t *doc_target, /** * Adds new documentation option specified by path `doc_path` that should be - * splitted by dots + * split by dots */ ucl_object_t *rspamd_rcl_add_doc_by_path (struct rspamd_config *cfg, const gchar *doc_path, diff --git a/src/libserver/html_tags.h b/src/libserver/html_tags.h index 8809975e3..c865fa21a 100644 --- a/src/libserver/html_tags.h +++ b/src/libserver/html_tags.h @@ -188,7 +188,7 @@ typedef enum #define CM_NO_INDENT (1 << 18) /* Elements that are obsolete (such as "dir", "menu"). */ #define CM_OBSOLETE (1 << 19) -/* User defined elements. Used to determine how attributes wihout value +/* User defined elements. Used to determine how attributes without value should be printed. */ #define CM_NEW (1 << 20) /* Elements that cannot be omitted. */ diff --git a/src/libserver/spf.c b/src/libserver/spf.c index 13877ed31..32ee6c453 100644 --- a/src/libserver/spf.c +++ b/src/libserver/spf.c @@ -1811,7 +1811,7 @@ parse_spf_scopes (struct spf_record *rec, gchar **begin) } else if (g_ascii_strncasecmp (*begin, SPF_SCOPE_MFROM, sizeof (SPF_SCOPE_MFROM) - 1) == 0) { - /* mfrom is standart spf1 check */ + /* mfrom is standard spf1 check */ *begin += sizeof (SPF_SCOPE_MFROM) - 1; continue; } diff --git a/src/libserver/symbols_cache.h b/src/libserver/symbols_cache.h index b71c6e9b9..dedcda4e6 100644 --- a/src/libserver/symbols_cache.h +++ b/src/libserver/symbols_cache.h @@ -169,7 +169,7 @@ gboolean rspamd_symbols_cache_process_symbols (struct rspamd_task *task, struct symbols_cache *cache, gint stage); /** - * Validate cache items agains theirs weights defined in metrics + * Validate cache items against theirs weights defined in metrics * @param cache symbols cache * @param cfg configuration * @param strict do strict checks - symbols MUST be described in metrics diff --git a/src/libserver/task.h b/src/libserver/task.h index 16e40aad1..1efa45309 100644 --- a/src/libserver/task.h +++ b/src/libserver/task.h @@ -183,7 +183,7 @@ struct rspamd_task { double time_virtual_finish; struct timeval tv; gboolean (*fin_callback)(struct rspamd_task *task, void *arg); - /**< calback for filters finalizing */ + /**< callback for filters finalizing */ void *fin_arg; /**< argument for fin callback */ struct rspamd_dns_resolver *resolver; /**< DNS resolver */ @@ -252,7 +252,7 @@ gboolean rspamd_task_process (struct rspamd_task *task, guint stages); struct rspamd_email_address* rspamd_task_get_sender (struct rspamd_task *task); /** - * Return addresses in the following precendence: + * Return addresses in the following precedence: * - deliver to * - the first smtp recipient * - the first mime recipient diff --git a/src/libutil/addr.h b/src/libutil/addr.h index 9b0921747..046d5f040 100644 --- a/src/libutil/addr.h +++ b/src/libutil/addr.h @@ -73,7 +73,7 @@ rspamd_inet_addr_t * rspamd_inet_address_from_rnds ( * Parse string with ipv6 address of length `len` to `target` which should be * at least sizeof (in6_addr_t) * @param text input string - * @param len lenth of `text` (if 0, then `text` must be zero terminated) + * @param len length of `text` (if 0, then `text` must be zero terminated) * @param target target structure * @return TRUE if the address has been parsed, otherwise `target` content is undefined */ @@ -84,7 +84,7 @@ gboolean rspamd_parse_inet_address_ip6 (const guchar *text, gsize len, * Parse string with ipv4 address of length `len` to `target` which should be * at least sizeof (in4_addr_t) * @param text input string - * @param len lenth of `text` (if 0, then `text` must be zero terminated) + * @param len length of `text` (if 0, then `text` must be zero terminated) * @param target target structure * @return TRUE if the address has been parsed, otherwise `target` content is undefined */ diff --git a/src/libutil/fstring.c b/src/libutil/fstring.c index 4aa678b0b..101bfa9f0 100644 --- a/src/libutil/fstring.c +++ b/src/libutil/fstring.c @@ -230,7 +230,7 @@ fstrhash_c (gchar c, guint32 hval) guint32 tmp; /* * xor in the current byte against each byte of hval - * (which alone gaurantees that every bit of input will have + * (which alone guarantees that every bit of input will have * an effect on the output) */ tmp = c & 0xFF; diff --git a/src/libutil/fstring.h b/src/libutil/fstring.h index ac69b01df..1d1d3b137 100644 --- a/src/libutil/fstring.h +++ b/src/libutil/fstring.h @@ -77,7 +77,7 @@ rspamd_fstring_t *rspamd_fstring_append_chars (rspamd_fstring_t *str, char c, gsize len) G_GNUC_WARN_UNUSED_RESULT; /** - * Erase `len` characters at postion `pos` + * Erase `len` characters at position `pos` */ void rspamd_fstring_erase (rspamd_fstring_t *str, gsize pos, gsize len); diff --git a/src/libutil/http.h b/src/libutil/http.h index 51d5098d8..e2e332d6f 100644 --- a/src/libutil/http.h +++ b/src/libutil/http.h @@ -545,7 +545,7 @@ void rspamd_http_router_handle_socket ( void rspamd_http_router_free (struct rspamd_http_connection_router *router); /** - * Extract arguments from a messsage's URI contained inside query string decoding + * Extract arguments from a message's URI contained inside query string decoding * them if needed * @param msg HTTP request message * @return new GHashTable which maps rspamd_ftok_t* to rspamd_ftok_t* diff --git a/src/libutil/logger.c b/src/libutil/logger.c index faab981d9..d4e3e95a7 100644 --- a/src/libutil/logger.c +++ b/src/libutil/logger.c @@ -762,12 +762,12 @@ file_log_helper (rspamd_logger_t *rspamd_log, } /* Fill buffer */ if (rspamd_log->io_buf.size < len) { - /* Buffer is too small to hold this string, so write it dirrectly */ + /* Buffer is too small to hold this string, so write it directly */ rspamd_log_flush (rspamd_log); direct_write_log_line (rspamd_log, (void *) iov, iovcnt, TRUE); } else if (rspamd_log->io_buf.used + len >= rspamd_log->io_buf.size) { - /* Buffer is full, try to write it dirrectly */ + /* Buffer is full, try to write it directly */ rspamd_log_flush (rspamd_log); fill_buffer (rspamd_log, iov, iovcnt); } diff --git a/src/libutil/map.c b/src/libutil/map.c index b8d04dc5d..77103ac00 100644 --- a/src/libutil/map.c +++ b/src/libutil/map.c @@ -396,7 +396,7 @@ http_map_finish (struct rspamd_http_connection *conn, return 0; } else { - /* Unsinged version - just open file */ + /* Unsigned version - just open file */ cbd->shmem_data = rspamd_http_message_shmem_ref (msg); cbd->data_len = msg->body_buf.len; diff --git a/src/libutil/mem_pool.h b/src/libutil/mem_pool.h index f16d454f2..2771be0db 100644 --- a/src/libutil/mem_pool.h +++ b/src/libutil/mem_pool.h @@ -254,13 +254,13 @@ void rspamd_mempool_unlock_mutex (rspamd_mempool_mutex_t *mutex); rspamd_mempool_rwlock_t * rspamd_mempool_get_rwlock (rspamd_mempool_t *pool); /** - * Aquire read lock + * Acquire read lock * @param lock rwlock object */ void rspamd_mempool_rlock_rwlock (rspamd_mempool_rwlock_t *lock); /** - * Aquire write lock + * Acquire write lock * @param lock rwlock object */ void rspamd_mempool_wlock_rwlock (rspamd_mempool_rwlock_t *lock); diff --git a/src/libutil/multipattern.h b/src/libutil/multipattern.h index 6a7dd4a88..785c09e3d 100644 --- a/src/libutil/multipattern.h +++ b/src/libutil/multipattern.h @@ -124,7 +124,7 @@ gboolean rspamd_multipattern_compile (struct rspamd_multipattern *mp, * @param in * @param len * @param cb if callback returns non-zero, then search is terminated and that value is returned - * @param ud calback data + * @param ud callback data * @return */ gint rspamd_multipattern_lookup (struct rspamd_multipattern *mp, diff --git a/src/libutil/printf.h b/src/libutil/printf.h index 043b347a2..7cf3bd4a8 100644 --- a/src/libutil/printf.h +++ b/src/libutil/printf.h @@ -55,7 +55,7 @@ /** * Callback used for common printf operations * @param buf buffer to append - * @param buflen lenght of the buffer + * @param buflen length of the buffer * @param ud opaque pointer * @return number of characters written */ diff --git a/src/libutil/radix.h b/src/libutil/radix.h index fc6e0db1e..c04528000 100644 --- a/src/libutil/radix.h +++ b/src/libutil/radix.h @@ -30,7 +30,7 @@ typedef struct radix_tree_compressed radix_compressed_t; * @param tree radix trie * @param key key to insert (bitstring) * @param keylen length of the key (in bytes) - * @param masklen lenght of mask that should be applied to the key (in bits) + * @param masklen length of mask that should be applied to the key (in bits) * @param value opaque value pointer * @return previous value of the key or `RADIX_NO_VALUE` */ diff --git a/src/libutil/str_util.h b/src/libutil/str_util.h index 473b5cbbb..3c2af2fb3 100644 --- a/src/libutil/str_util.h +++ b/src/libutil/str_util.h @@ -65,7 +65,7 @@ guint rspamd_gstring_icase_hash (gconstpointer key); gboolean rspamd_gstring_icase_equal (gconstpointer v, gconstpointer v2); /** - * Copy src to dest limited to len, in compare with standart strlcpy(3) rspamd strlcpy does not + * Copy src to dest limited to len, in compare with standard strlcpy(3) rspamd strlcpy does not * traverse the whole string and it is possible to use it for non NULL terminated strings. This is * more like memccpy(dst, src, size, '\0') * diff --git a/src/lua/lua_cfg_file.c b/src/lua/lua_cfg_file.c index 2e46f91fc..571278b21 100644 --- a/src/lua/lua_cfg_file.c +++ b/src/lua/lua_cfg_file.c @@ -40,7 +40,7 @@ lua_process_metric (lua_State *L, const gchar *name, struct rspamd_config *cfg) metric = rspamd_config_new_metric (cfg, metric, name); } - /* Now iterate throught module table */ + /* Now iterate through module table */ for (lua_pushnil (L); lua_next (L, -2); lua_pop (L, 1)) { /* key - -2, value - -1 */ symbol = @@ -125,7 +125,7 @@ rspamd_lua_post_load_config (struct rspamd_config *cfg) gsize keylen; GError *err = NULL; - /* First check all module options that may be overriden in 'config' global */ + /* First check all module options that may be overridden in 'config' global */ lua_getglobal (L, "config"); if (lua_istable (L, -1)) { diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c index 08e28fa70..cb65fad0a 100644 --- a/src/lua/lua_config.c +++ b/src/lua/lua_config.c @@ -187,7 +187,7 @@ LUA_FUNCTION_DEF (config, get_classifier); * - `weight`: weight of symbol (should normally be 1 or missing) * - `priority`: priority of symbol (normally 0 or missing) * - `type`: type of symbol: `normal` (default), `virtual` or `callback` - * - `flags`: various flags splitted by commas or spaces: + * - `flags`: various flags split by commas or spaces: * + `nice` if symbol can produce negative score; * + `empty` if symbol can be called for empty messages * + `skip` if symbol should be skipped now @@ -387,7 +387,7 @@ LUA_FUNCTION_DEF (config, disable_symbol); /*** * @method rspamd_config:__newindex(name, callback) * This metamethod is called if new indicies are added to the `rspamd_config` object. - * Technically, it is the equialent of @see rspamd_config:register_symbol where `weight` is 1.0. + * Technically, it is the equivalent of @see rspamd_config:register_symbol where `weight` is 1.0. * There is also table form invocation that allows to control more things: * * - `callback`: has the same meaning and acts as function of task @@ -438,7 +438,7 @@ LUA_FUNCTION_DEF (config, newindex); /*** * @method rspamd_config:register_regexp(params) * Registers new re for further cached usage - * Params is the table with the follwoing fields (mandatory fields are marked with `*`): + * Params is the table with the following fields (mandatory fields are marked with `*`): * - `re`* : regular expression object * - `type`*: type of regular expression: * + `mime`: mime regexp @@ -455,7 +455,7 @@ LUA_FUNCTION_DEF (config, register_regexp); /*** * @method rspamd_config:replace_regexp(params) * Replaces regexp with a new one - * Params is the table with the follwoing fields (mandatory fields are marked with `*`): + * Params is the table with the following fields (mandatory fields are marked with `*`): * - `old_re`* : old regular expression object (must be in the cache) * - `new_re`* : old regular expression object (must not be in the cache) */ @@ -548,7 +548,7 @@ LUA_FUNCTION_DEF (config, set_symbol_callback); * Adds new callback that is called on worker process termination when all * tasks pending are processed * - * @param callback {function} a fucntion with one argument (rspamd_task) + * @param callback {function} a function with one argument (rspamd_task) */ LUA_FUNCTION_DEF (config, register_finish_script); @@ -2008,7 +2008,7 @@ lua_config_newindex (lua_State *L) * "priority" - optional priority * "type" - optional type (normal, virtual, callback) * -- Metric options - * "score" - optional default score (overrided by metric) + * "score" - optional default score (overridden by metric) * "group" - optional default group * "one_shot" - optional one shot mode * "description" - optional description diff --git a/src/lua/lua_html.c b/src/lua/lua_html.c index 65fb99326..bfc411b94 100644 --- a/src/lua/lua_html.c +++ b/src/lua/lua_html.c @@ -79,7 +79,7 @@ LUA_FUNCTION_DEF (html, has_property); * - `src` - link to the source * - `height` - height in pixels * - `width` - width in pixels - * - `embeded` - `true` if an image is embedded in a message + * - `embedded` - `true` if an image is embedded in a message * @return {table} table of images in html part */ LUA_FUNCTION_DEF (html, get_images); diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c index cda331129..40c79624c 100644 --- a/src/lua/lua_http.c +++ b/src/lua/lua_http.c @@ -339,7 +339,7 @@ lua_http_push_headers (lua_State *L, struct rspamd_http_message *msg) * @param {string} mime_type MIME type of the HTTP content (for example, `text/html`) * @param {string/text} body full body content, can be opaque `rspamd{text}` to avoid data copying * @param {number} timeout floating point request timeout value in seconds (default is 5.0 seconds) - * @return {boolean} `true` if a request has been successfuly scheduled. If this value is `false` then some error occurred, the callback thus will not be called + * @return {boolean} `true` if a request has been successfully scheduled. If this value is `false` then some error occurred, the callback thus will not be called */ static gint lua_http_request (lua_State *L) diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c index 75b270189..362b43046 100644 --- a/src/lua/lua_mimepart.c +++ b/src/lua/lua_mimepart.c @@ -269,7 +269,7 @@ LUA_FUNCTION_DEF (mimepart, get_cte); /*** * @method mime_part:get_filename() - * Extract filename associated with mime part if it is an attachement + * Extract filename associated with mime part if it is an attachment * @return {string} filename or `nil` if no file is associated with this part */ LUA_FUNCTION_DEF (mimepart, get_filename); diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c index e0412e2da..06b699a38 100644 --- a/src/lua/lua_task.c +++ b/src/lua/lua_task.c @@ -75,7 +75,7 @@ LUA_FUNCTION_DEF (task, get_session); */ LUA_FUNCTION_DEF (task, get_ev_base); /*** - * @method task:insert_result(symbol, weigth[, option1, ...]) + * @method task:insert_result(symbol, weight[, option1, ...]) * Insert specific symbol to the tasks scanning results assigning the initial * weight to it. * @param {string} symbol symbol to insert @@ -102,7 +102,7 @@ LUA_FUNCTION_DEF (task, insert_result); * - `greylist`: greylist message * - `accept` or `no action`: whitelist message * @param {rspamd_action or string} action a numeric or string action value - * @param {string} description optional descripton + * @param {string} description optional description @example local function cb(task) local gr = task:get_header('Greylist') @@ -262,7 +262,7 @@ LUA_FUNCTION_DEF (task, get_raw_headers); * - `real_ip` - string representation of IP as resolved by PTR request of MTA * - `by_hostname` - MTA hostname * - `proto` - protocol, e.g. ESMTP or ESMTPS - * - `timestamp` - received timetamp + * - `timestamp` - received timestamp * - `for` - for value (unparsed mailbox) * * Please note that in some situations rspamd cannot parse all the fields of received headers. @@ -625,7 +625,7 @@ LUA_FUNCTION_DEF (task, set_milter_reply); /*** * @method task:process_re(params) * Processes the specified regexp and returns number of captures (cached or new) - * Params is the table with the follwoing fields (mandatory fields are marked with `*`): + * Params is the table with the following fields (mandatory fields are marked with `*`): * - `re`* : regular expression object * - `type`*: type of regular expression: * + `mime`: mime regexp @@ -636,7 +636,7 @@ LUA_FUNCTION_DEF (task, set_milter_reply); * + `url`: url regexp * - `header`: for header and rawheader regexp means the name of header * - `strong`: case sensitive match for headers - * @return {number} number of regexp occurences in the task (limited by 255 so far) + * @return {number} number of regexp occurrences in the task (limited by 255 so far) */ LUA_FUNCTION_DEF (task, process_regexp); diff --git a/src/lua/lua_util.c b/src/lua/lua_util.c index 6f9ded3cc..ef2adfe81 100644 --- a/src/lua/lua_util.c +++ b/src/lua/lua_util.c @@ -91,7 +91,7 @@ LUA_FUNCTION_DEF (util, decode_url); * @function util.tokenize_text(input[, exceptions]) * Create tokens from a text using optional exceptions list * @param {text/string} input input data - * @param {table} exceptions, a table of pairs containing of exceptions in the input + * @param {table} exceptions, a table of pairs containing of exceptions in the input * @return {table/strings} list of strings representing words in the text */ LUA_FUNCTION_DEF (util, tokenize_text); diff --git a/src/lua/rspamd.luadoc b/src/lua/rspamd.luadoc index 28f3f12f3..7f2c5ccc9 100644 --- a/src/lua/rspamd.luadoc +++ b/src/lua/rspamd.luadoc @@ -33,7 +33,7 @@ function config:get_metric (name) --- Register symbol in metric -- @param symbol name of symbol -- @param weight weight of symbol --- @param callback fucntion that would be called as callback for symbol +-- @param callback function that would be called as callback for symbol function metric:register_symbol (symbol, weight, callback) ------------------------------------- TASK ------------------------------------------- diff --git a/src/lua_worker.c b/src/lua_worker.c index ffd9df531..7dcb94277 100644 --- a/src/lua_worker.c +++ b/src/lua_worker.c @@ -177,7 +177,7 @@ lua_worker_register_exit_callback (lua_State *L) return 1; } -/* XXX: This fucntions should be rewritten completely */ +/* XXX: This functions should be rewritten completely */ static int lua_worker_get_option (lua_State *L) { diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index c558c56e6..a839aae5f 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -2794,7 +2794,7 @@ fuzzy_process_handler (struct rspamd_http_connection_entry *conn_ent, if (!is_hash) { /* Allocate message from string */ - /* XXX: what about encrypted messsages ? */ + /* XXX: what about encrypted messages ? */ task->msg.begin = msg->body_buf.begin; task->msg.len = msg->body_buf.len; diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua index 72a04866e..02dc0bb97 100644 --- a/src/plugins/lua/dmarc.lua +++ b/src/plugins/lua/dmarc.lua @@ -996,7 +996,7 @@ if opts['reporting'] == true then end else local is_authed = false - -- XXX: reporting address could be overidden + -- XXX: reporting address could be overridden for _, r in ipairs(results) do if string.match(r, 'v=DMARC1') then is_authed = true diff --git a/src/plugins/lua/maillist.lua b/src/plugins/lua/maillist.lua index 3b23e25f1..093e3164b 100644 --- a/src/plugins/lua/maillist.lua +++ b/src/plugins/lua/maillist.lua @@ -213,7 +213,7 @@ end -- Majordomo detector -- Check Sender for owner- or -owner --- Check Precendence for 'Bulk' or 'List' +-- Check Precedence for 'Bulk' or 'List' -- -- And nothing more can be extracted :( local function check_ml_majordomo(task) diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua index 81498dc71..bd0f4980e 100644 --- a/src/plugins/lua/settings.lua +++ b/src/plugins/lua/settings.lua @@ -34,8 +34,8 @@ local rspamd_regexp = require "rspamd_regexp" local ucl = require "ucl" local fun = require "fun" --- Checks for overrided settings within query params and returns 'true' if --- settings are overrided +-- Checks for overridden settings within query params and returns 'true' if +-- settings are overridden local function check_query_settings(task) -- Try 'settings' attribute local query_set = task:get_request_header('settings') diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua index fdf2568b7..ffd8dcbf2 100644 --- a/src/plugins/lua/spamassassin.lua +++ b/src/plugins/lua/spamassassin.lua @@ -44,7 +44,7 @@ local known_plugins = { 'Mail::SpamAssassin::Plugin::HTMLEval', } --- Table that replaces SA symbol with rspamd equialent +-- Table that replaces SA symbol with rspamd equivalent -- Used for dependency resolution local symbols_replacements = { -- SPF replacements diff --git a/src/worker_private.h b/src/worker_private.h index d3339ea26..50a53a624 100644 --- a/src/worker_private.h +++ b/src/worker_private.h @@ -42,7 +42,7 @@ struct rspamd_worker_ctx { gboolean is_http; /* JSON output */ gboolean is_json; - /* Allow learning throught worker */ + /* Allow learning through worker */ gboolean allow_learn; /* Limit of tasks */ guint32 max_tasks; diff --git a/test/lua/telescope.lua b/test/lua/telescope.lua index 098f879ea..e2d9e65fd 100644 --- a/test/lua/telescope.lua +++ b/test/lua/telescope.lua @@ -39,7 +39,7 @@ local setfenv = _G.setfenv or compat_env.setfenv local _VERSION = "0.6.0" ---- The status codes that can be returned by an invoked test. These should not be overidden. +--- The status codes that can be returned by an invoked test. These should not be overridden. -- @name status_codes -- @class table -- @field err - This is returned when an invoked test results in an error @@ -58,7 +58,7 @@ local status_codes = { } --- Labels used to show the various status_codes as a single character. --- These can be overidden if you wish. +-- These can be overridden if you wish. -- @name status_labels -- @class table -- @see status_codes diff --git a/test/lua/unit/expressions.lua b/test/lua/unit/expressions.lua index 1e5d09cb5..6072c6d02 100644 --- a/test/lua/unit/expressions.lua +++ b/test/lua/unit/expressions.lua @@ -32,7 +32,7 @@ context("Rspamd expressions", function() {'(((A))', nil}, -- Balanced braces {'(((A)))', '(A)'}, - -- Plus and comparision operators + -- Plus and comparison operators {'A + B + C + D > 2', '2 (A) (B) (C) (D) +(4) >'}, -- Plus and logic operators {'((A + B + C + D) > 2) & D', '(D) 2 (A) (B) (C) (D) +(4) > &'}, diff --git a/utils/fann_train.pl b/utils/fann_train.pl index c6a4bf15a..46b539489 100755 --- a/utils/fann_train.pl +++ b/utils/fann_train.pl @@ -15,7 +15,7 @@ my @spam; my @ham; my $max_samples = -1; my $split = 1; -my $preprocessed = 0; # ouptut is in format :<0|1>: +my $preprocessed = 0; # output is in format :<0|1>: my $score_spam = 12; my $score_ham = -6; diff --git a/utils/rspamd_stats.pl b/utils/rspamd_stats.pl index 374b3bc97..0a2ad46b8 100644 --- a/utils/rspamd_stats.pl +++ b/utils/rspamd_stats.pl @@ -473,7 +473,7 @@ Number of latest logs to exclude (0 by default). =item B<--correlations> -Additionaly print correlation rate for each symbol displayed. This routine calculates merely paired correlations between symbols. +Additionally print correlation rate for each symbol displayed. This routine calculates merely paired correlations between symbols. =item B<--search-pattern> -- 2.39.5