Spelling (#4086)

[Rework] Massive spelling fix from @jsoref

21 files changed, 45 insertions, 45 deletions

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 7af4b75a9..61999d547 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -129,7 +129,7 @@ enum rspamd_symbol_flags {
 	RSPAMD_SYMBOL_FLAG_NORMAL = 0,
 	RSPAMD_SYMBOL_FLAG_IGNORE_METRIC = (1 << 1),
 	RSPAMD_SYMBOL_FLAG_ONEPARAM = (1 << 2),
-	RSPAMD_SYMBOL_FLAG_UNGROUPPED = (1 << 3),
+	RSPAMD_SYMBOL_FLAG_UNGROUPED = (1 << 3),
 	RSPAMD_SYMBOL_FLAG_DISABLED = (1 << 4),
 	RSPAMD_SYMBOL_FLAG_UNSCORED = (1 << 5),
 };
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 6d2ea82d6..3a2797805 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -1106,7 +1106,7 @@ rspamd_include_map_handler (const guchar *data, gsize len,
  * $RUNDIR - local states directory
  * $DBDIR - databases dir
  * $LOGDIR - logs dir
- * $PLUGINSDIR - pluggins dir
+ * $PLUGINSDIR - plugins dir
  * $PREFIX - installation prefix
  * $VERSION - rspamd version
  */
@@ -1274,7 +1274,7 @@ rspamd_config_check_statfiles (struct rspamd_classifier_config *cf)
 		/* We have only one statfile */
 		return FALSE;
 	}
-	/* We have not detected any statfile that has different class, so turn on euristic based on symbol's name */
+	/* We have not detected any statfile that has different class, so turn on heuristic based on symbol's name */
 	has_other = FALSE;
 	cur = cf->statfiles;
 	while (cur) {
@@ -1567,11 +1567,11 @@ rspamd_config_new_symbol (struct rspamd_config *cfg, const gchar *symbol,
 	/* Search for symbol group */
 	if (group == NULL) {
 		group = "ungrouped";
-		sym_def->flags |= RSPAMD_SYMBOL_FLAG_UNGROUPPED;
+		sym_def->flags |= RSPAMD_SYMBOL_FLAG_UNGROUPED;
 	}
 	else {
 		if (strcmp (group, "ungrouped") == 0) {
-			sym_def->flags |= RSPAMD_SYMBOL_FLAG_UNGROUPPED;
+			sym_def->flags |= RSPAMD_SYMBOL_FLAG_UNGROUPED;
 		}
 	}
 
@@ -1584,7 +1584,7 @@ rspamd_config_new_symbol (struct rspamd_config *cfg, const gchar *symbol,
 	sym_def->gr = sym_group;
 	g_hash_table_insert (sym_group->symbols, sym_def->name, sym_def);
 
-	if (!(sym_def->flags & RSPAMD_SYMBOL_FLAG_UNGROUPPED)) {
+	if (!(sym_def->flags & RSPAMD_SYMBOL_FLAG_UNGROUPED)) {
 		g_ptr_array_add (sym_def->groups, sym_group);
 	}
 }
@@ -1622,7 +1622,7 @@ rspamd_config_add_symbol (struct rspamd_config *cfg,
 			}
 
 			if (!has_group) {
-				/* Non-empty group has a priority over non-groupped one */
+				/* Non-empty group has a priority over non-grouped one */
 				sym_group = g_hash_table_lookup (cfg->groups, group);
 
 				if (sym_group == NULL) {
@@ -1630,13 +1630,13 @@ rspamd_config_add_symbol (struct rspamd_config *cfg,
 					sym_group = rspamd_config_new_group (cfg, group);
 				}
 
-				if ((!sym_def->gr) || (sym_def->flags & RSPAMD_SYMBOL_FLAG_UNGROUPPED)) {
+				if ((!sym_def->gr) || (sym_def->flags & RSPAMD_SYMBOL_FLAG_UNGROUPED)) {
 					sym_def->gr = sym_group;
-					sym_def->flags &= ~RSPAMD_SYMBOL_FLAG_UNGROUPPED;
+					sym_def->flags &= ~RSPAMD_SYMBOL_FLAG_UNGROUPED;
 				}
 
 				g_hash_table_insert (sym_group->symbols, sym_def->name, sym_def);
-				sym_def->flags &= ~(RSPAMD_SYMBOL_FLAG_UNGROUPPED);
+				sym_def->flags &= ~(RSPAMD_SYMBOL_FLAG_UNGROUPED);
 				g_ptr_array_add (sym_def->groups, sym_group);
 			}
 		}
@@ -1755,7 +1755,7 @@ rspamd_config_add_symbol_group (struct rspamd_config *cfg,
 		}
 
 		if (!has_group) {
-			/* Non-empty group has a priority over non-groupped one */
+			/* Non-empty group has a priority over non-grouped one */
 			sym_group = g_hash_table_lookup (cfg->groups, group);
 
 			if (sym_group == NULL) {
@@ -1768,7 +1768,7 @@ rspamd_config_add_symbol_group (struct rspamd_config *cfg,
 			}
 
 			g_hash_table_insert (sym_group->symbols, sym_def->name, sym_def);
-			sym_def->flags &= ~(RSPAMD_SYMBOL_FLAG_UNGROUPPED);
+			sym_def->flags &= ~(RSPAMD_SYMBOL_FLAG_UNGROUPED);
 			g_ptr_array_add (sym_def->groups, sym_group);
 
 			return TRUE;
diff --git a/src/libserver/css/css_rule.hxx b/src/libserver/css/css_rule.hxx
index 8de6c7891..3385a0de1 100644
--- a/src/libserver/css/css_rule.hxx
+++ b/src/libserver/css/css_rule.hxx
@@ -114,7 +114,7 @@ public:
 
 	/**
 	 * Compile CSS declaration to the html block
-	 * @param pool used to carry memory requred for html_block
+	 * @param pool used to carry memory required for html_block
 	 * @return html block structure
 	 */
 	auto compile_to_block(rspamd_mempool_t *pool) const -> rspamd::html::html_block *;
diff --git a/src/libserver/dkim.h b/src/libserver/dkim.h
index 011b79eff..3116d245d 100644
--- a/src/libserver/dkim.h
+++ b/src/libserver/dkim.h
@@ -289,7 +289,7 @@ rspamd_dkim_key_t *rspamd_dkim_parse_key (const gchar *txt, gsize *keylen,
 										  GError **err);
 
 /**
- * Canonocalise header using relaxed algorithm
+ * Canonicalise header using relaxed algorithm
  * @param hname
  * @param hvalue
  * @param out
diff --git a/src/libserver/fuzzy_backend/fuzzy_backend.c b/src/libserver/fuzzy_backend/fuzzy_backend.c
index 548714e36..2d4f75f60 100644
--- a/src/libserver/fuzzy_backend/fuzzy_backend.c
+++ b/src/libserver/fuzzy_backend/fuzzy_backend.c
@@ -335,7 +335,7 @@ rspamd_fuzzy_digest_hash (gconstpointer key)
 {
 	guint ret;
 
-	/* Distirbuted uniformly already */
+	/* Distributed uniformly already */
 	memcpy (&ret, key, sizeof (ret));
 
 	return ret;
diff --git a/src/libserver/html/html.cxx b/src/libserver/html/html.cxx
index 7fb0b091d..a5cab7470 100644
--- a/src/libserver/html/html.cxx
+++ b/src/libserver/html/html.cxx
@@ -250,7 +250,7 @@ html_parse_tag_content(rspamd_mempool_t *pool,
 		ignore_bad_tag,
 		tag_end,
 		slash_after_value,
-		slash_in_unqouted_value,
+		slash_in_unquoted_value,
 	} state;
 
 	state = static_cast<enum tag_parser_state>(parser_env.cur_state);
@@ -418,7 +418,7 @@ html_parse_tag_content(rspamd_mempool_t *pool,
 			 */
 			if (*in == '>') {
 				/*
-				 * Attribtute name followed by end of tag
+				 * Attribute name followed by end of tag
 				 * Should be okay (empty attribute). The rest is handled outside
 				 * this automata.
 				 */
@@ -514,7 +514,7 @@ html_parse_tag_content(rspamd_mempool_t *pool,
 
 	case parse_value:
 		if (*in == '/') {
-			state = slash_in_unqouted_value;
+			state = slash_in_unquoted_value;
 		}
 		else if (g_ascii_isspace (*in) || *in == '>' || *in == '"') {
 			store_component_value();
@@ -570,9 +570,9 @@ html_parse_tag_content(rspamd_mempool_t *pool,
 			state = parse_attr_name;
 		}
 		break;
-	case slash_in_unqouted_value:
+	case slash_in_unquoted_value:
 		if (*in == '>') {
-			/* That slash was in fact closing tag slash, wohoo */
+			/* That slash was in fact closing tag slash, woohoo */
 			tag->flags |= FL_CLOSED;
 			state = tag_end;
 			store_component_value();
diff --git a/src/libserver/html/html_url.cxx b/src/libserver/html/html_url.cxx
index 0b48c7a75..0068ea30f 100644
--- a/src/libserver/html/html_url.cxx
+++ b/src/libserver/html/html_url.cxx
@@ -237,7 +237,7 @@ html_check_displayed_url(rspamd_mempool_t *pool,
 	gsize dlen;
 
 	if (visible_part.empty()) {
-		/* No dispalyed url, just some text within <a> tag */
+		/* No displayed url, just some text within <a> tag */
 		return;
 	}
 
diff --git a/src/libserver/http/http_connection.c b/src/libserver/http/http_connection.c
index d24732819..599810c20 100644
--- a/src/libserver/http/http_connection.c
+++ b/src/libserver/http/http_connection.c
@@ -1353,7 +1353,7 @@ rspamd_http_connection_copy_msg (struct rspamd_http_message *msg, GError **err)
 	if (msg->body_buf.len > 0) {
 
 		if (msg->flags & RSPAMD_HTTP_FLAG_SHMEM) {
-			/* Avoid copying by just maping a shared segment */
+			/* Avoid copying by just mapping a shared segment */
 			new_msg->flags |= RSPAMD_HTTP_FLAG_SHMEM_IMMUTABLE;
 
 			storage = &new_msg->body_buf.c;
diff --git a/src/libserver/http/http_context.c b/src/libserver/http/http_context.c
index 2dbaff0a4..e86d8ae79 100644
--- a/src/libserver/http/http_context.c
+++ b/src/libserver/http/http_context.c
@@ -129,7 +129,7 @@ rspamd_http_context_parse_proxy (struct rspamd_http_context *ctx,
 	struct upstream_list *uls;
 
 	if (!ctx->ups_ctx) {
-		msg_err ("cannot parse http_proxy %s - upstreams context is udefined", name);
+		msg_err ("cannot parse http_proxy %s - upstreams context is undefined", name);
 		return;
 	}
 
diff --git a/src/libserver/logger/logger.c b/src/libserver/logger/logger.c
index 846c6d3a9..d44e81aa8 100644
--- a/src/libserver/logger/logger.c
+++ b/src/libserver/logger/logger.c
@@ -466,12 +466,12 @@ rspamd_common_logv (rspamd_logger_t *rspamd_log, gint level_flags,
 
 			if (!(rspamd_log->flags & RSPAMD_LOG_FLAG_RSPAMADM)) {
 				if ((nescaped = rspamd_log_line_need_escape (logbuf, end - logbuf)) != 0) {
-					gsize unsecaped_len = end - logbuf;
-					gchar *logbuf_escaped = g_alloca (unsecaped_len + nescaped * 4);
+					gsize unescaped_len = end - logbuf;
+					gchar *logbuf_escaped = g_alloca (unescaped_len + nescaped * 4);
 					log_line = logbuf_escaped;
 
-					end = rspamd_log_line_hex_escape (logbuf, unsecaped_len,
-							logbuf_escaped, unsecaped_len + nescaped * 4);
+					end = rspamd_log_line_hex_escape (logbuf, unescaped_len,
+							logbuf_escaped, unescaped_len + nescaped * 4);
 				}
 			}
 
diff --git a/src/libserver/maps/map.c b/src/libserver/maps/map.c
index 19c6c6e6c..995509ded 100644
--- a/src/libserver/maps/map.c
+++ b/src/libserver/maps/map.c
@@ -1128,7 +1128,7 @@ rspamd_map_schedule_periodic (struct rspamd_map *map, int how)
 
 	/* Now, we do some sanity checks for jittered seconds */
 	if (!(how & RSPAMD_MAP_SCHEDULE_INIT)) {
-		/* Never allow too low interval between timer checks, it is epxensive */
+		/* Never allow too low interval between timer checks, it is expensive */
 		if (jittered_sec < min_timer_interval) {
 			jittered_sec = rspamd_time_jitter (min_timer_interval, 0);
 		}
diff --git a/src/libserver/maps/map_helpers.c b/src/libserver/maps/map_helpers.c
index c7b3ce00c..456af4dc0 100644
--- a/src/libserver/maps/map_helpers.c
+++ b/src/libserver/maps/map_helpers.c
@@ -1308,7 +1308,7 @@ rspamd_re_map_finalize (struct rspamd_regexp_map_helper *re_map)
 
 #if !defined(__aarch64__) && !defined(__powerpc64__)
 	if (!(map->cfg->libs_ctx->crypto_ctx->cpu_config & CPUID_SSSE3)) {
-		msg_info_map ("disable hyperscan for map %s, ssse3 instructons are not supported by CPU",
+		msg_info_map ("disable hyperscan for map %s, ssse3 instructions are not supported by CPU",
 				map->name);
 		return;
 	}
diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c
index 64f5f7a40..0428cfdc7 100644
--- a/src/libserver/re_cache.c
+++ b/src/libserver/re_cache.c
@@ -441,7 +441,7 @@ rspamd_re_cache_init (struct rspamd_re_cache *cache, struct rspamd_config *cfg)
 				sizeof (fl));
 		rspamd_cryptobox_hash_update (&st_global, (const guchar *) &fl,
 				sizeof (fl));
-		/* Numberic order */
+		/* Numeric order */
 		rspamd_cryptobox_hash_update (re_class->st, (const guchar *)&i,
 				sizeof (i));
 		rspamd_cryptobox_hash_update (&st_global, (const guchar *)&i,
@@ -1744,7 +1744,7 @@ static gchar *
 rspamd_re_cache_hs_pattern_from_pcre (rspamd_regexp_t *re)
 {
 	/*
-	 * Workaroung for bug in ragel 7.0.0.11
+	 * Workaround for bug in ragel 7.0.0.11
 	 * https://github.com/intel/hyperscan/issues/133
 	 */
 	const gchar *pat = rspamd_regexp_get_pattern (re);
diff --git a/src/libserver/rspamd_symcache.c b/src/libserver/rspamd_symcache.c
index 7be447957..d2989d213 100644
--- a/src/libserver/rspamd_symcache.c
+++ b/src/libserver/rspamd_symcache.c
@@ -424,7 +424,7 @@ cache_logic_cmp (const void *p1, const void *p2, gpointer ud)
 
 
 	if (o1 == o2) {
-		/* Heurstic */
+		/* Heuristic */
 		if (i1->priority == i2->priority) {
 			avg_freq = ((gdouble) cache->total_hits / cache->used_items);
 			avg_weight = (cache->total_weight / cache->used_items);
@@ -3194,7 +3194,7 @@ rspamd_symcache_finalize_item (struct rspamd_task *task,
 		 * one more time
 		 */
 		msg_debug_cache_task ("postpone finalisation of %s(%d) as there are %d "
-							  "async events pendning",
+							  "async events pending",
 							  item->symbol, item->id, dyn_item->async_events);
 
 		return;
diff --git a/src/libserver/rspamd_symcache.h b/src/libserver/rspamd_symcache.h
index c497c28cb..1d670db04 100644
--- a/src/libserver/rspamd_symcache.h
+++ b/src/libserver/rspamd_symcache.h
@@ -528,7 +528,7 @@ gboolean rspamd_symcache_is_item_allowed (struct rspamd_task *task,
 										  gboolean exec_only);
 
 /**
- * Returns symbcache item flags
+ * Returns symcache item flags
  * @param item
  * @return
  */
@@ -547,7 +547,7 @@ const gchar* rspamd_symcache_item_name (struct rspamd_symcache_item *item);
 const struct rspamd_symcache_item_stat *
 		rspamd_symcache_item_stat (struct rspamd_symcache_item *item);
 /**
- * Returns if an item is enabled (for virutal it also means that parent should be enabled)
+ * Returns if an item is enabled (for virtual it also means that parent should be enabled)
  * @param item
  * @return
  */
diff --git a/src/libserver/spf.c b/src/libserver/spf.c
index b33f06c01..16a1c2579 100644
--- a/src/libserver/spf.c
+++ b/src/libserver/spf.c
@@ -44,7 +44,7 @@
 struct spf_resolved_element {
 	GPtrArray *elts;
 	gchar *cur_domain;
-	gboolean redirected; /* Ingnore level, it's redirected */
+	gboolean redirected; /* Ignore level, it's redirected */
 };
 
 struct spf_record {
@@ -796,7 +796,7 @@ spf_process_txt_record (struct spf_record *rec, struct spf_resolved_element *res
 	gboolean ret = FALSE;
 
 	/*
-	 * We prefer spf version 1 as other records are mostly likely garbadge
+	 * We prefer spf version 1 as other records are mostly likely garbage
 	 * or incorrect records (e.g. spf2 records)
 	 */
 	LL_FOREACH (reply->entries, elt) {
@@ -1134,7 +1134,7 @@ parse_spf_domain_mask (struct spf_record *rec, struct spf_addr *addr,
 		parse_ipv4_mask,
 		parse_second_slash,
 		parse_ipv6_mask,
-		skip_garbadge
+		skip_garbage
 	} state = 0;
 	const gchar *p = addr->spf_string, *host, *c;
 	gchar *hostbuf;
@@ -1183,7 +1183,7 @@ parse_spf_domain_mask (struct spf_record *rec, struct spf_addr *addr,
 					state = parse_ipv4_mask;
 				}
 				else {
-					state = skip_garbadge;
+					state = skip_garbage;
 				}
 				cur_mask = 0;
 				break;
@@ -1216,7 +1216,7 @@ parse_spf_domain_mask (struct spf_record *rec, struct spf_addr *addr,
 				}
 				p++;
 				break;
-			case skip_garbadge:
+			case skip_garbage:
 				p++;
 				break;
 		}
diff --git a/src/libserver/task.h b/src/libserver/task.h
index ca10c0105..9c9db32e9 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -32,7 +32,7 @@ extern "C" {
 enum rspamd_command {
 	CMD_SKIP = 0,
 	CMD_PING,
-	CMD_CHECK_SPAMC, /* Legacy spamasassin format */
+	CMD_CHECK_SPAMC, /* Legacy spamassassin format */
 	CMD_CHECK_RSPAMC, /* Legacy rspamc format (like SA one) */
 	CMD_CHECK, /* Legacy check - metric json reply */
 	CMD_CHECK_V2, /* Modern check - symbols in json reply  */
diff --git a/src/libserver/url.c b/src/libserver/url.c
index 3a9c90608..22bd60a43 100644
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -230,7 +230,7 @@ struct rspamd_url_flag_name {
 		{"schema_encoded", RSPAMD_URL_FLAG_SCHEMAENCODED, -1},
 		{"path_encoded", RSPAMD_URL_FLAG_PATHENCODED, -1},
 		{"query_encoded", RSPAMD_URL_FLAG_QUERYENCODED, -1},
-		{"missing_slahes", RSPAMD_URL_FLAG_MISSINGSLASHES, -1},
+		{"missing_slashes", RSPAMD_URL_FLAG_MISSINGSLASHES, -1},
 		{"idn", RSPAMD_URL_FLAG_IDN, -1},
 		{"has_port", RSPAMD_URL_FLAG_HAS_PORT, -1},
 		{"has_user", RSPAMD_URL_FLAG_HAS_USER, -1},
diff --git a/src/libserver/url.h b/src/libserver/url.h
index e8677fdc2..6918d96ad 100644
--- a/src/libserver/url.h
+++ b/src/libserver/url.h
@@ -140,7 +140,7 @@ void rspamd_url_deinit(void);
  * @param pool memory pool
  * @param task task object
  * @param part current text part
- * @param is_html turn on html euristic
+ * @param is_html turn on html heuristic
  */
 void rspamd_url_text_extract(rspamd_mempool_t *pool,
 							 struct rspamd_task *task,
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 5b1b7765e..6392aa8a9 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -682,7 +682,7 @@ rspamd_controller_send_ucl (struct rspamd_http_connection_entry *entry,
 static void
 rspamd_worker_drop_priv (struct rspamd_main *rspamd_main)
 {
-	if (rspamd_main->is_privilleged) {
+	if (rspamd_main->is_privileged) {
 		if (setgid (rspamd_main->workers_gid) == -1) {
 			msg_err_main ("cannot setgid to %d (%s), aborting",
 					(gint) rspamd_main->workers_gid,
diff --git a/src/libserver/worker_util.h b/src/libserver/worker_util.h
index a67a966ca..12f73aa4c 100644
--- a/src/libserver/worker_util.h
+++ b/src/libserver/worker_util.h
@@ -88,7 +88,7 @@ typedef gint (*rspamd_controller_func_t) (
 struct rspamd_custom_controller_command {
 	const gchar *command;
 	struct module_ctx *ctx;
-	gboolean privilleged;
+	gboolean privileged;
 	gboolean require_message;
 	rspamd_controller_func_t handler;
 };