CLEANUP: assorted typo fixes in the code and comments

This is 22nd iteration of typo fixes
This commit is contained in:
Ilya Shipitsin 2021-04-24 13:25:42 +05:00 committed by Christopher Faulet
parent df3db630e4
commit b2be9a1ea9
14 changed files with 24 additions and 24 deletions

View File

@ -6794,7 +6794,7 @@ http-request wait-for-body time <time> [ at-least <bytes> ]
follows the HAProxy time format and is expressed in milliseconds. follows the HAProxy time format and is expressed in milliseconds.
<bytes> is optional. It is the minimum payload size to receive to stop to <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. bytes.
Example: 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. follows the HAProxy time format and is expressed in milliseconds.
<bytes> is optional. It is the minimum payload size to receive to stop to <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. bytes.
Example: Example:
@ -12100,7 +12100,7 @@ tcp-request content <action> [{if | unless} <condition>]
"tcp-request content" rules are not evaluated. This upgrade method should be "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 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 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 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. unsupported to route an HTTP connection (upgraded or not) to a TCP server.

View File

@ -1793,7 +1793,7 @@ set var <name> <expression>
<expression> may only involve "internal" sample fetch keywords and converters <expression> may only involve "internal" sample fetch keywords and converters
even though the most likely useful ones will be str('something') or int(). 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 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 "operator" or "admin". This command is only supported on a CLI connection
running in experimental mode (see "experimental-mode on"). running in experimental mode (see "experimental-mode on").

View File

@ -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 /* 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); int check_action_rules(struct list *rules, struct proxy *px, int *err_code);

View File

@ -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 the first index set plus one in <set> starting from the lowest.
* Returns 0 if no index set. * 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); int ha_cpuset_ffs(const struct hap_cpuset *set);

View File

@ -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 * 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 * 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 * 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. * caller must ensure are available before calling the function.
*/ */
static inline int slz_finish(struct slz_stream *strm, void *buf) static inline int slz_finish(struct slz_stream *strm, void *buf)

View File

@ -25,7 +25,7 @@
/* Check an action ruleset validity. It returns the number of error encountered /* 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) int check_action_rules(struct list *rules, struct proxy *px, int *err_code)
{ {

View File

@ -8,7 +8,7 @@
#include <haproxy/proxy.h> #include <haproxy/proxy.h>
#include <haproxy/server.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 * This can be used as a shortcut to set value pointed by <ret> to 1 at the
* same time. * same time.
*/ */

View File

@ -1201,7 +1201,7 @@ struct task *process_chk_conn(struct task *t, void *context, unsigned int state)
} }
else if (check->result == CHK_RES_CONDPASS) { else if (check->result == CHK_RES_CONDPASS) {
/* check is OK but asks for stopping mode */ /* 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); check_notify_stopping(check);
} }
else if (check->result == CHK_RES_PASSED) { else if (check->result == CHK_RES_PASSED) {

View File

@ -337,7 +337,7 @@ __decl_thread(__decl_rwlock(fd_mig_lock));
void fd_delete(int fd) void fd_delete(int fd)
{ {
/* we must postpone removal of an FD that may currently be in use /* 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 * - after a takeover, the owning thread closes the connection but
* the previous one just woke up from the poller and entered * the previous one just woke up from the poller and entered
* the FD handler iocb. That thread holds an entry in running_mask * the FD handler iocb. That thread holds an entry in running_mask

View File

@ -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. * 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 * 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 * 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 * internal error occurred. Finally ACT_RET_ABRT is returned when a timeout
* occured. * occurred.
*/ */
static enum act_return http_action_wait_for_body(struct act_rule *rule, struct proxy *px, static enum act_return http_action_wait_for_body(struct act_rule *rule, struct proxy *px,
struct session *sess, struct stream *s, int flags) struct session *sess, struct stream *s, int flags)

View File

@ -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_CONT when conditions are met to stop waiting
* - HTTP_RULE_RES_YIELD to wait for more data * - 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_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 * to the client, depending on the channel (408 on request side, 504 on response
* side). All other errors must be handled by the caller. * side). All other errors must be handled by the caller.
*/ */

View File

@ -930,7 +930,7 @@ err:
* it returns NULL. * it returns NULL.
* *
* Note: the sink is created using the name * 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) 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; sft->ofs = ~0;
HA_SPIN_INIT(&sft->lock); HA_SPIN_INIT(&sft->lock);
/* prepare descrition for sink */ /* prepare description for the sink */
chunk_reset(&trash); chunk_reset(&trash);
chunk_printf(&trash, "created from logserver declared into '%s' at line %d", logsrv->conf.file, logsrv->conf.line); chunk_printf(&trash, "created from logserver declared into '%s' at line %d", logsrv->conf.file, logsrv->conf.line);

View File

@ -308,7 +308,7 @@ static inline void send_eob(struct slz_stream *strm)
enqueue8(strm, 0, 7); // direct encoding of 256 = EOB (cf RFC1951) 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. * buf + <len>. <len> must not be null.
*/ */
static void copy_lit(struct slz_stream *strm, const void *buf, uint32_t len, int more) 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); } 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. * 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) 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 * 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 * 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. * 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 * available before calling the function. Note that if the initial header was
* never sent, it will be sent first as well (10 extra bytes). * 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 * 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 * 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 * 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 * 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 * the initial header was never sent, it will be sent first as well (2 extra
* bytes). * bytes).

View File

@ -925,7 +925,7 @@ enum tcpcheck_eval_ret tcpcheck_agent_expect_reply(struct check *check, struct t
if (ps) { if (ps) {
const char *msg; 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); msg = server_parse_weight_change_request(check->server, ps);
if (!wrn || !*wrn) if (!wrn || !*wrn)
wrn = msg; wrn = msg;
@ -1261,7 +1261,7 @@ enum tcpcheck_eval_ret tcpcheck_eval_connect(struct check *check, struct tcpchec
out: out:
if (conn && check->result == CHK_RES_FAILED) { if (conn && check->result == CHK_RES_FAILED) {
conn->flags |= CO_FL_ERROR; 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) if (ret == TCPCHK_EVAL_CONTINUE && check->proxy->timeout.check)