From b2be9a1ea9a6a4c53856825ff51a288c3bf8acaa Mon Sep 17 00:00:00 2001
From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Sat, 24 Apr 2021 13:25:42 +0500
Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments

This is 22nd iteration of typo fixes
---
 doc/configuration.txt    | 6 +++---
 doc/management.txt       | 2 +-
 include/haproxy/action.h | 2 +-
 include/haproxy/cpuset.h | 2 +-
 include/import/slz.h     | 2 +-
 src/action.c             | 2 +-
 src/cfgdiag.c            | 2 +-
 src/check.c              | 2 +-
 src/fd.c                 | 2 +-
 src/http_act.c           | 4 ++--
 src/http_ana.c           | 6 +++---
 src/sink.c               | 4 ++--
 src/slz.c                | 8 ++++----
 src/tcpcheck.c           | 4 ++--
 14 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 375eedafa..db78c0704 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -6794,7 +6794,7 @@ http-request wait-for-body time <time> [ at-least <bytes> ]
               follows the HAProxy time format and is expressed in milliseconds.
 
     <bytes>   is optional. It is the minimum payload size to receive to stop to
-              wait. It fallows the HAProxy size format and is expressed in
+              wait. It follows the HAProxy size format and is expressed in
               bytes.
 
   Example:
@@ -7248,7 +7248,7 @@ http-response wait-for-body time <time> [ at-least <bytes> ]
               follows the HAProxy time format and is expressed in milliseconds.
 
     <bytes>   is optional. It is the minimum payload size to receive to stop to
-              wait. It fallows the HAProxy size format and is expressed in
+              wait. It follows the HAProxy size format and is expressed in
               bytes.
 
   Example:
@@ -12100,7 +12100,7 @@ tcp-request content <action> [{if | unless} <condition>]
   "tcp-request content" rules are not evaluated. This upgrade method should be
   preferred to the implicit one consisting to rely on the backend mode. When
   used, it is possible to set HTTP directives in a frontend without any
-  warning. These directives will be conditionnaly evaluated if the HTTP upgrade
+  warning. These directives will be conditionaly evaluated if the HTTP upgrade
   is performed. However, an HTTP backend must still be selected. It remains
   unsupported to route an HTTP connection (upgraded or not) to a TCP server.
 
diff --git a/doc/management.txt b/doc/management.txt
index cee26839a..1e79eb788 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1793,7 +1793,7 @@ set var <name> <expression>
   <expression> may only involve "internal" sample fetch keywords and converters
   even though the most likely useful ones will be str('something') or int().
   Note that the command line parser doesn't know about quotes, so any space in
-  the expression must be preceeded by a backslash. This command requires levels
+  the expression must be preceded by a backslash. This command requires levels
   "operator" or "admin". This command is only supported on a CLI connection
   running in experimental mode (see "experimental-mode on").
 
diff --git a/include/haproxy/action.h b/include/haproxy/action.h
index 62fba7ed3..39f756f16 100644
--- a/include/haproxy/action.h
+++ b/include/haproxy/action.h
@@ -77,7 +77,7 @@ static inline void action_build_list(struct list *keywords,
 }
 
 /* Check an action ruleset validity. It returns the number of error encountered
- * andd err_code is updated if a warning is emitted.
+ * and err_code is updated if a warning is emitted.
  */
 int check_action_rules(struct list *rules, struct proxy *px, int *err_code);
 
diff --git a/include/haproxy/cpuset.h b/include/haproxy/cpuset.h
index f6cea4325..6e1627131 100644
--- a/include/haproxy/cpuset.h
+++ b/include/haproxy/cpuset.h
@@ -27,7 +27,7 @@ int ha_cpuset_count(const struct hap_cpuset *set);
 
 /* Returns the first index set plus one in <set> starting from the lowest.
  * Returns 0 if no index set.
- * Do not forget to substract the result by one if using it for set/clr.
+ * Do not forget to subtract the result by one if using it for set/clr.
  */
 int ha_cpuset_ffs(const struct hap_cpuset *set);
 
diff --git a/include/import/slz.h b/include/import/slz.h
index 0251a855f..0f284e303 100644
--- a/include/import/slz.h
+++ b/include/import/slz.h
@@ -151,7 +151,7 @@ static inline long slz_encode(struct slz_stream *strm, void *out,
  * It returns the number of bytes emitted. The trailer consists in flushing the
  * possibly pending bits from the queue (up to 24 bits), rounding to the next
  * byte, then 4 bytes for the CRC when doing zlib/gzip, then another 4 bytes
- * for the input length for gzip. That may abount to 4+4+4 = 12 bytes, that the
+ * for the input length for gzip. That may about to 4+4+4 = 12 bytes, that the
  * caller must ensure are available before calling the function.
  */
 static inline int slz_finish(struct slz_stream *strm, void *buf)
diff --git a/src/action.c b/src/action.c
index 5e430f23a..98359badd 100644
--- a/src/action.c
+++ b/src/action.c
@@ -25,7 +25,7 @@
 
 
 /* Check an action ruleset validity. It returns the number of error encountered
- * andd err_code is updated if a warning is emitted.
+ * and err_code is updated if a warning is emitted.
  */
 int check_action_rules(struct list *rules, struct proxy *px, int *err_code)
 {
diff --git a/src/cfgdiag.c b/src/cfgdiag.c
index a06ae0fe9..f8e4a9e08 100644
--- a/src/cfgdiag.c
+++ b/src/cfgdiag.c
@@ -8,7 +8,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/server.h>
 
-/* Use this fonction to emit diagnostic.
+/* Use this function to emit diagnostic.
  * This can be used as a shortcut to set value pointed by <ret> to 1 at the
  * same time.
  */
diff --git a/src/check.c b/src/check.c
index ee225a282..026f1c5b6 100644
--- a/src/check.c
+++ b/src/check.c
@@ -1201,7 +1201,7 @@ struct task *process_chk_conn(struct task *t, void *context, unsigned int state)
 			}
 			else if (check->result == CHK_RES_CONDPASS) {
 				/* check is OK but asks for stopping mode */
-				TRACE_DEVEL("report conditionnal success", CHK_EV_TASK_WAKE|CHK_EV_HCHK_END|CHK_EV_HCHK_SUCC, check);
+				TRACE_DEVEL("report conditional success", CHK_EV_TASK_WAKE|CHK_EV_HCHK_END|CHK_EV_HCHK_SUCC, check);
 				check_notify_stopping(check);
 			}
 			else if (check->result == CHK_RES_PASSED) {
diff --git a/src/fd.c b/src/fd.c
index f4a28cd3a..3387653a5 100644
--- a/src/fd.c
+++ b/src/fd.c
@@ -337,7 +337,7 @@ __decl_thread(__decl_rwlock(fd_mig_lock));
 void fd_delete(int fd)
 {
 	/* we must postpone removal of an FD that may currently be in use
-	 * by another thread. This can happend in the following two situations:
+	 * by another thread. This can happen in the following two situations:
 	 *   - after a takeover, the owning thread closes the connection but
 	 *     the previous one just woke up from the poller and entered
 	 *     the FD handler iocb. That thread holds an entry in running_mask
diff --git a/src/http_act.c b/src/http_act.c
index 58e1bb857..eb70d7ac4 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -2335,8 +2335,8 @@ static enum act_parse_ret parse_http_return(const char **args, int *orig_arg, st
  * function. it returns ACT_RET_CONT when conditions are met to stop to wait.
  * Otherwise ACT_RET_YIELD is returned to wait for more data. ACT_RET_INV is
  * returned if a parsing error is raised by lower level and ACT_RET_ERR if an
- * internal error occured. Finally ACT_RET_ABRT is returned when a timeout
- * occured.
+ * internal error occurred. Finally ACT_RET_ABRT is returned when a timeout
+ * occurred.
  */
 static enum act_return http_action_wait_for_body(struct act_rule *rule, struct proxy *px,
 						 struct session *sess, struct stream *s, int flags)
diff --git a/src/http_ana.c b/src/http_ana.c
index 0a32107fa..77d6d1b12 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -4107,11 +4107,11 @@ static int http_handle_stats(struct stream *s, struct channel *req)
  *
  *   - HTTP_RULE_RES_CONT when  conditions are met to stop waiting
  *   - HTTP_RULE_RES_YIELD to wait for more data
- *   - HTTP_RULE_RES_ABRT when a timeout occured.
+ *   - HTTP_RULE_RES_ABRT when a timeout occurred.
  *   - HTTP_RULE_RES_BADREQ if a parsing error is raised by lower level
- *   - HTTP_RULE_RES_ERROR if an internal error occured
+ *   - HTTP_RULE_RES_ERROR if an internal error occurred
  *
- * If a timeout occured, this function is responsible to emit the right response
+ * If a timeout occurred, this function is responsible to emit the right response
  * to the client, depending on the channel (408 on request side, 504 on response
  * side). All other errors must be handled by the caller.
  */
diff --git a/src/sink.c b/src/sink.c
index 63d37786f..5605c2b23 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -930,7 +930,7 @@ int cfg_parse_ring(const char *file, int linenum, char **args, int kwm)
  * it returns NULL.
  *
  * Note: the sink is created using the name
- *       specified inot logsrv->ring_name
+ *       specified into logsrv->ring_name
  */
 struct sink *sink_new_from_logsrv(struct logsrv *logsrv)
 {
@@ -998,7 +998,7 @@ struct sink *sink_new_from_logsrv(struct logsrv *logsrv)
 	sft->ofs = ~0;
 	HA_SPIN_INIT(&sft->lock);
 
-	/* prepare descrition for sink */
+	/* prepare description for the sink */
 	chunk_reset(&trash);
 	chunk_printf(&trash, "created from logserver declared into '%s' at line %d", logsrv->conf.file, logsrv->conf.line);
 
diff --git a/src/slz.c b/src/slz.c
index db261f8e7..a9104ea9e 100644
--- a/src/slz.c
+++ b/src/slz.c
@@ -308,7 +308,7 @@ static inline void send_eob(struct slz_stream *strm)
 	enqueue8(strm, 0, 7); // direct encoding of 256 = EOB (cf RFC1951)
 }
 
-/* copies <len> litterals from <buf>. <more> indicates that there are data past
+/* copies <len> literals from <buf>. <more> indicates that there are data past
  * buf + <len>. <len> must not be null.
  */
 static void copy_lit(struct slz_stream *strm, const void *buf, uint32_t len, int more)
@@ -337,7 +337,7 @@ static void copy_lit(struct slz_stream *strm, const void *buf, uint32_t len, int
 	} while (len);
 }
 
-/* copies <len> litterals from <buf>. <more> indicates that there are data past
+/* copies <len> literals from <buf>. <more> indicates that there are data past
  * buf + <len>. <len> must not be null.
  */
 static void copy_lit_huff(struct slz_stream *strm, const unsigned char *buf, uint32_t len, int more)
@@ -1029,7 +1029,7 @@ int slz_rfc1952_init(struct slz_stream *strm, int level)
  * returns the number of bytes emitted. The trailer consists in flushing the
  * possibly pending bits from the queue (up to 24 bits), rounding to the next
  * byte, then 4 bytes for the CRC and another 4 bytes for the input length.
- * That may abount to 4+4+4 = 12 bytes, that the caller must ensure are
+ * That may about to 4+4+4 = 12 bytes, that the caller must ensure are
  * available before calling the function. Note that if the initial header was
  * never sent, it will be sent first as well (10 extra bytes).
  */
@@ -1283,7 +1283,7 @@ int slz_rfc1950_init(struct slz_stream *strm, int level)
  * buffer <buf>. When it's done, the stream state is updated to SLZ_ST_END. It
  * returns the number of bytes emitted. The trailer consists in flushing the
  * possibly pending bits from the queue (up to 24 bits), rounding to the next
- * byte, then 4 bytes for the CRC. That may abount to 4+4 = 8 bytes, that the
+ * byte, then 4 bytes for the CRC. That may about to 4+4 = 8 bytes, that the
  * caller must ensure are available before calling the function. Note that if
  * the initial header was never sent, it will be sent first as well (2 extra
  * bytes).
diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index bc6eb3c15..d1f9a155d 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -925,7 +925,7 @@ enum tcpcheck_eval_ret tcpcheck_agent_expect_reply(struct check *check, struct t
 	if (ps) {
 		const char *msg;
 
-		TRACE_DEVEL("change server weigth", CHK_EV_TCPCHK_EXP, check);
+		TRACE_DEVEL("change server weight", CHK_EV_TCPCHK_EXP, check);
 		msg = server_parse_weight_change_request(check->server, ps);
 		if (!wrn || !*wrn)
 			wrn = msg;
@@ -1261,7 +1261,7 @@ enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct tcpchec
   out:
 	if (conn && check->result == CHK_RES_FAILED) {
 		conn->flags |= CO_FL_ERROR;
-		TRACE_ERROR("connect failed, report conncetion error", CHK_EV_TCPCHK_CONN|CHK_EV_TCPCHK_ERR, check);
+		TRACE_ERROR("connect failed, report connection error", CHK_EV_TCPCHK_CONN|CHK_EV_TCPCHK_ERR, check);
 	}
 
 	if (ret == TCPCHK_EVAL_CONTINUE && check->proxy->timeout.check)