CLEANUP: assorted typo fixes in the code and comments

This is 25th iteration of typo fixes
This commit is contained in:
Ilya Shipitsin 2021-08-07 14:41:56 +05:00 committed by Willy Tarreau
parent 762b1fdb7a
commit 01881087fc
17 changed files with 25 additions and 25 deletions

View File

@ -523,7 +523,7 @@ do not think about them anymore after a few patches.
should be able to tell whether or not a patch is likely to address an issue should be able to tell whether or not a patch is likely to address an issue
they are facing. Indicating what the code will do after the fix doesn't help they are facing. Indicating what the code will do after the fix doesn't help
if it does not say what problem is encountered without the patch. Note that if it does not say what problem is encountered without the patch. Note that
in some cases the bug is purely theorical and observed by reading the code. in some cases the bug is purely theoretical and observed by reading the code.
In this case it's perfectly fine to provide an estimate about possible In this case it's perfectly fine to provide an estimate about possible
effects. Also, in HAProxy, like many projects which take a great care of effects. Also, in HAProxy, like many projects which take a great care of
maintaining stable branches, patches are reviewed later so that some of them maintaining stable branches, patches are reviewed later so that some of them

View File

@ -178,7 +178,7 @@ compilation errors. Also, some early versions of the GNU libc used to include a
regex engine which could be slow or even crash on certain patterns. regex engine which could be slow or even crash on certain patterns.
If you plan on importing a particularly heavy configuration involving a lot of If you plan on importing a particularly heavy configuration involving a lot of
regex, you may benefit from using some alternative regex implementations sur as regex, you may benefit from using some alternative regex implementations such as
PCRE. HAProxy natively supports PCRE and PCRE2, both in standard and JIT PCRE. HAProxy natively supports PCRE and PCRE2, both in standard and JIT
flavors (Just In Time). The following options are available depending on the flavors (Just In Time). The following options are available depending on the
library version provided on your system : library version provided on your system :

View File

@ -450,7 +450,7 @@ timeout idle <timeout>
timeout processing <timeout> timeout processing <timeout>
Set the maximum time to wait for a stream to process an event, i.e to acquire Set the maximum time to wait for a stream to process an event, i.e to acquire
a stream to talk with an agent, to encode all messages, to send the NOTIFY a stream to talk with an agent, to encode all messages, to send the NOTIFY
frame, to receive the corrsponding acknowledgement and to process all frame, to receive the corresponding acknowledgement and to process all
actions. It is applied on the stream that handle the client and the server actions. It is applied on the stream that handle the client and the server
sessions. sessions.

View File

@ -813,7 +813,7 @@ expression made of any combination of:
- a non-nul integer (e.g. '1'), always returns "true". - a non-nul integer (e.g. '1'), always returns "true".
- a predicate optionally followed by argument(s) in parenthesis. - a predicate optionally followed by argument(s) in parenthesis.
- a condition placed between a pair of parenthesis '(' and ')' - a condition placed between a pair of parenthesis '(' and ')'
- a question mark ('!') preceeding any of the non-empty elements above, and - a question mark ('!') preceding any of the non-empty elements above, and
which will negate its status. which will negate its status.
- expressions combined with a logical AND ('&&'), which will be evaluated - expressions combined with a logical AND ('&&'), which will be evaluated
from left to right until one returns false from left to right until one returns false
@ -17798,11 +17798,11 @@ fc_conn_err : integer
Returns the ID of the error that might have occurred on the current Returns the ID of the error that might have occurred on the current
connection. Any strictly positive value of this fetch indicates that the connection. Any strictly positive value of this fetch indicates that the
connection did not succeed and would result in an error log being output (as connection did not succeed and would result in an error log being output (as
decribed in section 8.2.5). See the "fc_conn_err_str" fetch for a full list of described in section 8.2.5). See the "fc_conn_err_str" fetch for a full list of
error codes and their corresponding error message. error codes and their corresponding error message.
fc_conn_err_str : string fc_conn_err_str : string
Returns an error message decribing what problem happened on the current Returns an error message describing what problem happened on the current
connection, resulting in a connection failure. This string corresponds to the connection, resulting in a connection failure. This string corresponds to the
"message" part of the error log format (see section 8.2.5). See below for a "message" part of the error log format (see section 8.2.5). See below for a
full list of error codes and their corresponding error messages : full list of error codes and their corresponding error messages :

View File

@ -60,7 +60,7 @@ ones, with their respective sequences:
allowed to run anymore. The tasks retrieve their execution context from allowed to run anymore. The tasks retrieve their execution context from
the scheduler in the arguments, but will check the tasks' context from the scheduler in the arguments, but will check the tasks' context from
the structure under the lock to detect this possible change, and abort. the structure under the lock to detect this possible change, and abort.
- at this point the takeover suceeded, the idle_conns_lock is released and - at this point the takeover succeeded, the idle_conns_lock is released and
the connection and its FD are now owned by the caller the connection and its FD are now owned by the caller
2) poll report: happens on late rx, shutdown or error on idle conns 2) poll report: happens on late rx, shutdown or error on idle conns
@ -81,7 +81,7 @@ ones, with their respective sequences:
- check the task/tasklet's context to verify that no recently completed - check the task/tasklet's context to verify that no recently completed
takeover() stole the connection. If it's NULL, the connection was lost, takeover() stole the connection. If it's NULL, the connection was lost,
the lock is released and the task/tasklet killed. Otherwise it is the lock is released and the task/tasklet killed. Otherwise it is
guaranted that no other thread may use that connection (current takeover guaranteed that no other thread may use that connection (current takeover
candidates are waiting on the lock, previous owners waking from poll() candidates are waiting on the lock, previous owners waking from poll()
lost their bit in the thread_mask and will not touch the FD). lost their bit in the thread_mask and will not touch the FD).
- the connection is removed from the idle conns list. From this point on, - the connection is removed from the idle conns list. From this point on,

View File

@ -566,7 +566,7 @@ static forceinline struct ebmb_node *__ebmb_lookup_prefix(struct eb_root *root,
/* Insert ebmb_node <new> into a prefix subtree starting at node root <root>. /* Insert ebmb_node <new> into a prefix subtree starting at node root <root>.
* Only new->key and new->pfx need be set with the key and its prefix length. * Only new->key and new->pfx need be set with the key and its prefix length.
* Note that bits between <pfx> and <len> are theorically ignored and should be * Note that bits between <pfx> and <len> are theoretically ignored and should be
* zero, as it is not certain yet that they will always be ignored everywhere * zero, as it is not certain yet that they will always be ignored everywhere
* (eg in bit compare functions). * (eg in bit compare functions).
* The ebmb_node is returned. * The ebmb_node is returned.

View File

@ -32,7 +32,7 @@
Eg, to store 8, 10, 12, 13, 14 : Eg, to store 8, 10, 12, 13, 14 :
ultree this theorical tree ultree this theoretical tree
8 8 8 8
/ \ / \ / \ / \

View File

@ -16,7 +16,7 @@
# applet:start_response() # applet:start_response()
# end) # end)
# #
# This had as a consequence to log %TR field with approximatively the same value as # This had as a consequence to log %TR field with approximately the same value as
# the LUA sleep time. # the LUA sleep time.
varnishtest "LUA bug" varnishtest "LUA bug"

View File

@ -323,7 +323,7 @@ int cfg_parse_cond_and(const char **text, struct cfg_cond_and **expr, char **err
/* ret=1, we have a term in the left hand set */ /* ret=1, we have a term in the left hand set */
/* find an optionnal '&&' */ /* find an optional '&&' */
while (*in == ' ' || *in == '\t') while (*in == ' ' || *in == '\t')
in++; in++;
@ -396,7 +396,7 @@ int cfg_parse_cond_expr(const char **text, struct cfg_cond_expr **expr, char **e
/* ret=1, we have a sub-expr in the left hand set */ /* ret=1, we have a sub-expr in the left hand set */
/* find an optionnal '||' */ /* find an optional '||' */
while (*in == ' ' || *in == '\t') while (*in == ' ' || *in == '\t')
in++; in++;

View File

@ -63,7 +63,7 @@ ebmb_lookup_prefix(struct eb_root *root, const void *x, unsigned int pfx)
/* Insert ebmb_node <new> into a prefix subtree starting at node root <root>. /* Insert ebmb_node <new> into a prefix subtree starting at node root <root>.
* Only new->key and new->pfx need be set with the key and its prefix length. * Only new->key and new->pfx need be set with the key and its prefix length.
* Note that bits between <pfx> and <len> are theorically ignored and should be * Note that bits between <pfx> and <len> are theoretically ignored and should be
* zero, as it is not certain yet that they will always be ignored everywhere * zero, as it is not certain yet that they will always be ignored everywhere
* (eg in bit compare functions). * (eg in bit compare functions).
* The ebmb_node is returned. * The ebmb_node is returned.

View File

@ -44,7 +44,7 @@ DECLARE_STATIC_POOL(pool_head_fcgi_hdr_rule, "fcgi_hdr_rule", sizeof(struct fcgi
/**************************************************************************/ /**************************************************************************/
/* Makes a fcgi parameter name (prefixed by ':fcgi-') with <name> (in /* Makes a fcgi parameter name (prefixed by ':fcgi-') with <name> (in
* lowercase). All non alphanumeric character are replaced by an underscore * lowercase). All non alphanumeric character are replaced by an underscore
* ('_'). The result is copied into <dst>. the corrsponding ist is returned. * ('_'). The result is copied into <dst>. the corresponding ist is returned.
*/ */
static struct ist fcgi_param_name(char *dst, const struct ist name) static struct ist fcgi_param_name(char *dst, const struct ist name)
{ {

View File

@ -246,7 +246,7 @@ struct ist fix_tag_value(const struct ist msg, unsigned int tagid)
if (!id) if (!id)
goto not_found_or_invalid; goto not_found_or_invalid;
if (id == tagid) { if (id == tagid) {
/* <tagId> found, return the corrsponding value */ /* <tagId> found, return the corresponding value */
return v; return v;
} }

View File

@ -340,7 +340,7 @@ static void fwrr_queue_srv(struct server *s)
grp = (s->flags & SRV_F_BACKUP) ? &p->lbprm.fwrr.bck : &p->lbprm.fwrr.act; grp = (s->flags & SRV_F_BACKUP) ? &p->lbprm.fwrr.bck : &p->lbprm.fwrr.act;
/* Delay everything which does not fit into the window and everything /* Delay everything which does not fit into the window and everything
* which does not fit into the theorical new window. * which does not fit into the theoretical new window.
*/ */
if (!srv_willbe_usable(s)) { if (!srv_willbe_usable(s)) {
fwrr_remove_from_tree(s); fwrr_remove_from_tree(s);

View File

@ -1375,7 +1375,7 @@ static int fcgi_set_default_param(struct fcgi_conn *fconn, struct fcgi_strm *fst
goto check_index; goto check_index;
/* If some special characters are found in the decoded path (\n /* If some special characters are found in the decoded path (\n
* or \0), the PATH_INFO regex cannot match. This is theorically * or \0), the PATH_INFO regex cannot match. This is theoretically
* valid, but probably unexpected, to have such characters. So, * valid, but probably unexpected, to have such characters. So,
* to avoid any surprises, an error is triggered in this * to avoid any surprises, an error is triggered in this
* case. * case.

View File

@ -951,7 +951,7 @@ static int peer_prepare_switchmsg(char *msg, size_t size, struct peer_prep_param
*/ */
intencode(st->table->data_nbelem[data_type], &chunkq); intencode(st->table->data_nbelem[data_type], &chunkq);
/* for array of freq counters, there is an additionnal /* for array of freq counters, there is an additional
* period parameter to encode * period parameter to encode
*/ */
if (stktable_data_types[data_type].std_type == STD_T_FRQP) if (stktable_data_types[data_type].std_type == STD_T_FRQP)
@ -2179,7 +2179,7 @@ static inline int peer_treat_definemsg(struct appctx *appctx, struct peer *p,
goto ignore_msg; goto ignore_msg;
} }
/* Check if there there is the additionnal expire data */ /* Check if there there is the additional expire data */
intdecode(msg_cur, msg_end); intdecode(msg_cur, msg_end);
if (*msg_cur) { if (*msg_cur) {
uint64_t data_type; uint64_t data_type;
@ -2205,7 +2205,7 @@ static inline int peer_treat_definemsg(struct appctx *appctx, struct peer *p,
/* check if the data_type match the current from the bitfield */ /* check if the data_type match the current from the bitfield */
if (type != data_type) { if (type != data_type) {
p->remote_table = NULL; p->remote_table = NULL;
TRACE_PROTO("meta data missmatch type", PEERS_EV_DEFMSG, NULL, p); TRACE_PROTO("meta data mismatch type", PEERS_EV_DEFMSG, NULL, p);
goto ignore_msg; goto ignore_msg;
} }
@ -2242,7 +2242,7 @@ static inline int peer_treat_definemsg(struct appctx *appctx, struct peer *p,
/* check if the data_type match the current from the bitfield */ /* check if the data_type match the current from the bitfield */
if (type != data_type) { if (type != data_type) {
p->remote_table = NULL; p->remote_table = NULL;
TRACE_PROTO("meta data missmatch type", PEERS_EV_DEFMSG, NULL, p); TRACE_PROTO("meta data mismatch type", PEERS_EV_DEFMSG, NULL, p);
goto ignore_msg; goto ignore_msg;
} }

View File

@ -1725,7 +1725,7 @@ static int qc_prep_hdshk_pkts(struct quic_conn_ctx *ctx)
reuse_wbuf = 0; reuse_wbuf = 0;
wbuf = q_wbuf(qc); wbuf = q_wbuf(qc);
qel = &qc->els[tel]; qel = &qc->els[tel];
/* When entering this function, the writter buffer must be empty. /* When entering this function, the writer buffer must be empty.
* Most of the time it points to the reader buffer. * Most of the time it points to the reader buffer.
*/ */
while ((q_buf_empty(wbuf) || reuse_wbuf)) { while ((q_buf_empty(wbuf) || reuse_wbuf)) {

View File

@ -58,7 +58,7 @@ static inline void dequeue_srv(struct srv *s) {
void put_srv(struct srv *s) { void put_srv(struct srv *s) {
if (s->w <= 0 || if (s->w <= 0 ||
s->next >= 2*sw || /* delay everything which does not fit into the window */ s->next >= 2*sw || /* delay everything which does not fit into the window */
s->next >= sw+nsw) { /* and everything which does not fit into the theorical new window */ s->next >= sw+nsw) { /* and everything which does not fit into the theoretical new window */
/* put into next tree */ /* put into next tree */
s->next -= sw; // readjust next in case we could finally take this back to current. s->next -= sw; // readjust next in case we could finally take this back to current.
queue_by_weight_0(next_tree, s); queue_by_weight_0(next_tree, s);
@ -348,7 +348,7 @@ main(int argc, char **argv) {
s->w = w; s->w = w;
/* we must measure how far we are from the end of the current window /* we must measure how far we are from the end of the current window
* and try to fit their as many entries as should theorically be. * and try to fit their as many entries as should theoretically be.
*/ */
//s->w = s->w * (2*sw - p) / sw; //s->w = s->w * (2*sw - p) / sw;