From 8bd071d4fa63c4087dab6cf8ba19f19b13bb3c36 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Fri, 29 Jul 2022 22:26:53 +0500 Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments This is 31st iteration of typo fixes (cherry picked from commit 3b64a28e156026526be0ca540c5950569f80a477) [wt: dropped irrelevant entries for 2.6] Signed-off-by: Willy Tarreau --- addons/deviceatlas/dummy/dac.h | 2 +- doc/design-thoughts/thread-group.txt | 2 +- doc/internals/api/appctx.txt | 4 ++-- doc/internals/api/pools.txt | 2 +- include/haproxy/ncbuf-t.h | 2 +- include/haproxy/proxy-t.h | 4 ++-- include/haproxy/task.h | 2 +- include/haproxy/xprt_quic-t.h | 4 ++-- include/haproxy/xprt_quic.h | 2 +- src/cfgparse.c | 2 +- src/check.c | 2 +- src/http_client.c | 4 ++-- src/mux_fcgi.c | 2 +- src/mux_quic.c | 4 ++-- src/ncbuf.c | 4 ++-- src/quic_sock.c | 2 +- src/stconn.c | 8 ++++---- src/xprt_quic.c | 12 ++++++------ 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/addons/deviceatlas/dummy/dac.h b/addons/deviceatlas/dummy/dac.h index 55bc6c025..bf166ae54 100644 --- a/addons/deviceatlas/dummy/dac.h +++ b/addons/deviceatlas/dummy/dac.h @@ -227,7 +227,7 @@ da_status_t da_atlas_open(da_atlas_t *atlas, da_property_decl_t *extra_props, co * @brief read from a mapped data which then replace da_atlas_compile call * * @param dumppath, anonymous if NULL - * @param map for anonymous, it is the responsability of the caller to unmap it, ignored otherwise + * @param map for anonymous, it is the responsibility of the caller to unmap it, ignored otherwise * @param maplen for anonymous, it is the size of the mapped data, ignored otherwise * @param ptr Pointer dynamically allocated if the mapping happened normally * @param len size of the atlas image diff --git a/doc/design-thoughts/thread-group.txt b/doc/design-thoughts/thread-group.txt index 14afbb86f..f1aad7b8d 100644 --- a/doc/design-thoughts/thread-group.txt +++ b/doc/design-thoughts/thread-group.txt @@ -405,7 +405,7 @@ the FD, and all those with a bit in it ought to do it. - thread_mask (in bind_conf->rx_settings) should become an array of MAX_TGROUP longs. - when parsing "thread 123" or "thread 2/37", the proper bit is set, - assuming the array is either a contigous bitfield or a tgroup array. + assuming the array is either a contiguous bitfield or a tgroup array. An option RX_O_THR_PER_GRP or RX_O_THR_PER_PROC is set depending on how the thread num was parsed, so that we reject mixes. - end of parsing: entries translated to the cleanest form (to be determined) diff --git a/doc/internals/api/appctx.txt b/doc/internals/api/appctx.txt index 0597e10d9..137ec7b6c 100644 --- a/doc/internals/api/appctx.txt +++ b/doc/internals/api/appctx.txt @@ -20,7 +20,7 @@ context that was allowed to use extra fields of various types. Other applets preferred to use their own context definition. All this resulted in the appctx->ctx to contain a myriad of definitions of -vairous service contexts, and in some services abusing other services' +various service contexts, and in some services abusing other services' definitions by laziness, and others being extended to use their own definition after having run for a long time on the generic types, some of which were not noticed and mistakenly used the same storage locations by accident. A massive @@ -44,7 +44,7 @@ purposed function is provided: "applet_reserve_svcctx()". This function will require the caller to indicate how large an area it needs, and will return a pointer to this area after checking that it fits. If it does not, haproxy will crash. This is purposely done so that it's known during development that if a -small structure doesn't fit, a differnet approach is required. +small structure doesn't fit, a different approach is required. As such, for the vast majority of commands, the process is the following one: diff --git a/doc/internals/api/pools.txt b/doc/internals/api/pools.txt index 2ca354c23..315d5c4b2 100644 --- a/doc/internals/api/pools.txt +++ b/doc/internals/api/pools.txt @@ -573,5 +573,5 @@ CONFIG_HAP_POOL_CLUSTER_SIZE This allows one to define the maximum number of objects that will be groupped together in an allocation from the shared pool. Values 4 to 8 have experimentally shown good results with 16 threads. On systems with - more cores or losely coupled caches exhibiting slow atomic operations, + more cores or loosely coupled caches exhibiting slow atomic operations, it could possibly make sense to slightly increase this value. diff --git a/include/haproxy/ncbuf-t.h b/include/haproxy/ncbuf-t.h index 93c5d433e..0dd958fbc 100644 --- a/include/haproxy/ncbuf-t.h +++ b/include/haproxy/ncbuf-t.h @@ -7,7 +7,7 @@ * store data in a non-linear way with gaps between them. The buffer is * circular and so data may wrapped. * - * The API of is splitted in two parts. Please refer to the public API + * The API of is split in two parts. Please refer to the public API * declared in this header file which should cover all the needs. * * To minimize the memory footprint, size of data and gaps are inserted in the diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h index 3d8e0a59e..0a94d3ab7 100644 --- a/include/haproxy/proxy-t.h +++ b/include/haproxy/proxy-t.h @@ -144,9 +144,9 @@ enum PR_SRV_STATE_FILE { #define PR_O2_FAKE_KA 0x00200000 /* pretend we do keep-alive with server even though we close */ -#define PR_O2_RSTRICT_REQ_HDR_NAMES_BLK 0x00400000 /* reject request with header names containing chars ouside of [0-9a-zA-Z-] charset */ +#define PR_O2_RSTRICT_REQ_HDR_NAMES_BLK 0x00400000 /* reject request with header names containing chars outside of [0-9a-zA-Z-] charset */ #define PR_O2_RSTRICT_REQ_HDR_NAMES_DEL 0x00800000 /* remove request header names containing chars outside of [0-9a-zA-Z-] charset */ -#define PR_O2_RSTRICT_REQ_HDR_NAMES_NOOP 0x01000000 /* preserve request header names containing chars ouside of [0-9a-zA-Z-] charset */ +#define PR_O2_RSTRICT_REQ_HDR_NAMES_NOOP 0x01000000 /* preserve request header names containing chars outside of [0-9a-zA-Z-] charset */ #define PR_O2_RSTRICT_REQ_HDR_NAMES_MASK 0x01c00000 /* mask for restrict-http-header-names option */ /* unused : 0x0000000..0x80000000 */ diff --git a/include/haproxy/task.h b/include/haproxy/task.h index f69c73b1a..55e8ce20b 100644 --- a/include/haproxy/task.h +++ b/include/haproxy/task.h @@ -225,7 +225,7 @@ static inline void _task_wakeup(struct task *t, unsigned int f, const char *file * happened since the flag was set will result in the task being queued (if * it wasn't already). This is used to safely drop the flag from within the * scheduler. The flag is combined with existing flags before the test so - * that it's possible to inconditionally wakeup the task and drop the RUNNING + * that it's possible to unconditionally wakeup the task and drop the RUNNING * flag if needed. */ #define task_drop_running(t, f) _task_drop_running(t, f, __FILE__, __LINE__) diff --git a/include/haproxy/xprt_quic-t.h b/include/haproxy/xprt_quic-t.h index 26b801fea..6d398474f 100644 --- a/include/haproxy/xprt_quic-t.h +++ b/include/haproxy/xprt_quic-t.h @@ -443,9 +443,9 @@ struct quic_rx_crypto_frm { #define QUIC_FL_TX_PACKET_PADDING (1UL << 1) /* Flag a sent packet as being in flight. */ #define QUIC_FL_TX_PACKET_IN_FLIGHT (QUIC_FL_TX_PACKET_ACK_ELICITING | QUIC_FL_TX_PACKET_PADDING) -/* Flag a sent packet as containg a CONNECTION_CLOSE frame */ +/* Flag a sent packet as containing a CONNECTION_CLOSE frame */ #define QUIC_FL_TX_PACKET_CC (1UL << 2) -/* Flag a sent packet as containg an ACK frame */ +/* Flag a sent packet as containing an ACK frame */ #define QUIC_FL_TX_PACKET_ACK (1UL << 3) /* Flag a sent packet as being coalesced to another one in the same datagram */ #define QUIC_FL_TX_PACKET_COALESCED (1UL << 4) diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h index 3fc0f7451..a6698d5a3 100644 --- a/include/haproxy/xprt_quic.h +++ b/include/haproxy/xprt_quic.h @@ -69,7 +69,7 @@ static inline void quic_cid_cpy(struct quic_cid *dst, const struct quic_cid *src } /* Copy socket address data into buffer. - * This is the responsability of the caller to check the output buffer is big + * This is the responsibility of the caller to check the output buffer is big * enough to contain these socket address data. * Return the number of bytes copied. */ diff --git a/src/cfgparse.c b/src/cfgparse.c index 0cea5145b..0a801ed15 100644 --- a/src/cfgparse.c +++ b/src/cfgparse.c @@ -3789,7 +3789,7 @@ out_uri_auth_compat: if (!bind_conf->mux_proto) { /* No protocol was specified. If we're using QUIC at the transport * layer, we'll instantiate it as a mux as well. If QUIC is not - * compiled in, this wil remain NULL. + * compiled in, this will remain NULL. */ if (bind_conf->xprt && bind_conf->xprt == xprt_get(XPRT_QUIC)) bind_conf->mux_proto = get_mux_proto(ist("quic")); diff --git a/src/check.c b/src/check.c index f717d09f3..b04f5fe4e 100644 --- a/src/check.c +++ b/src/check.c @@ -1574,7 +1574,7 @@ int init_srv_check(struct server *srv) } else { /* For dynamic servers, check-ssl and check-send-proxy must be - * explicitely defined even if the check port was not + * explicitly defined even if the check port was not * overridden. */ if (srv->check.use_ssl == 1) diff --git a/src/http_client.c b/src/http_client.c index a19583243..cd93ade9a 100644 --- a/src/http_client.c +++ b/src/http_client.c @@ -468,7 +468,7 @@ int httpclient_set_dst(struct httpclient *hc, const char *dst) } /* - * Return a splitted URL in , , + * Return a split URL in , , */ static void httpclient_spliturl(struct ist url, enum http_scheme *scheme, struct ist *host, int *port) @@ -877,7 +877,7 @@ static void httpclient_applet_io_handler(struct appctx *appctx) if (hc->ops.res_payload) hc->ops.res_payload(hc); - /* cannot copy everything, need to processs */ + /* cannot copy everything, need to process */ if (vlen != blksz) goto process_data; } else { diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c index bb9ec5667..6afa9ad88 100644 --- a/src/mux_fcgi.c +++ b/src/mux_fcgi.c @@ -3858,7 +3858,7 @@ struct task *fcgi_deferred_shut(struct task *t, void *ctx, unsigned int state) return NULL; } -/* shutr() called by the stream conector (mux_ops.shutr) */ +/* shutr() called by the stream connector (mux_ops.shutr) */ static void fcgi_shutr(struct stconn *sc, enum co_shr_mode mode) { struct fcgi_strm *fstrm = __sc_mux_strm(sc); diff --git a/src/mux_quic.c b/src/mux_quic.c index 0f617de90..a1b2babc7 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -915,7 +915,7 @@ static int qcs_build_stream_frm(struct qcs *qcs, struct buffer *out, char fin, return -1; } -/* Check after transfering data from qcs.tx.buf if FIN must be set on the next +/* Check after transferring data from qcs.tx.buf if FIN must be set on the next * STREAM frame for . * * Returns true if FIN must be set else false. @@ -1091,7 +1091,7 @@ static int _qc_send_qcs(struct qcs *qcs, struct list *frms) /* out buffer cannot be emptied if qcs offsets differ. */ BUG_ON(!b_data(out) && qcs->tx.sent_offset != qcs->tx.offset); - /* FIN is set if all incoming data were transfered. */ + /* FIN is set if all incoming data were transferred. */ fin = qcs_stream_fin(qcs); /* Build a new STREAM frame with buffer. */ diff --git a/src/ncbuf.c b/src/ncbuf.c index b0e0099b4..c7fd7ef95 100644 --- a/src/ncbuf.c +++ b/src/ncbuf.c @@ -506,7 +506,7 @@ int ncb_is_fragmented(const struct ncbuf *buf) return !ncb_blk_is_last(buf, gap); } -/* Returns the number of bytes of data avaiable in starting at offset +/* Returns the number of bytes of data available in starting at offset * until the next gap or the buffer end. The counted data may wrapped if * the buffer storage is not aligned. */ @@ -589,7 +589,7 @@ enum ncb_ret ncb_add(struct ncbuf *buf, ncb_sz_t off, ncb_sz_t done; /* retrieve the next block. This is necessary to do this - * before overwritting a gap. + * before overwriting a gap. */ next = ncb_blk_next(buf, blk); diff --git a/src/quic_sock.c b/src/quic_sock.c index 2b8e8d604..c2ffb77a5 100644 --- a/src/quic_sock.c +++ b/src/quic_sock.c @@ -295,7 +295,7 @@ void quic_sock_fd_iocb(int fd) max_dgrams = global.tune.maxpollevents; start: - /* Try to reuse an existing dgram. Note that there is alway at + /* Try to reuse an existing dgram. Note that there is always at * least one datagram to pick, except the first time we enter * this function for this buffer. */ diff --git a/src/stconn.c b/src/stconn.c index 4aed31f2d..5dca089a2 100644 --- a/src/stconn.c +++ b/src/stconn.c @@ -244,7 +244,7 @@ static void sc_free_cond(struct stconn **scp) /* Attaches a stconn to a mux endpoint and sets the endpoint ctx. Returns - * -1 on error and 0 on sucess. SE_FL_DETACHED flag is removed. This function is + * -1 on error and 0 on success. SE_FL_DETACHED flag is removed. This function is * called from a mux when it is attached to a stream or a health-check. */ int sc_attach_mux(struct stconn *sc, void *sd, void *ctx) @@ -286,7 +286,7 @@ int sc_attach_mux(struct stconn *sc, void *sd, void *ctx) } /* Attaches a stconn to an applet endpoint and sets the endpoint - * ctx. Returns -1 on error and 0 on sucess. SE_FL_DETACHED flag is + * ctx. Returns -1 on error and 0 on success. SE_FL_DETACHED flag is * removed. This function is called by a stream when a backend applet is * registered. */ @@ -431,7 +431,7 @@ void sc_destroy(struct stconn *sc) /* Resets the stream connector endpoint. It happens when the app layer want to renew * its endpoint. For a connection retry for instance. If a mux or an applet is - * attached, a new endpoint is created. Returns -1 on error and 0 on sucess. + * attached, a new endpoint is created. Returns -1 on error and 0 on success. * * Only SE_FL_ERROR flag is removed on the endpoint. Orther flags are preserved. * It is the caller responsibility to remove other flags if needed. @@ -1964,7 +1964,7 @@ void sc_conn_prepare_endp_upgrade(struct stconn *sc) sc_ep_set(sc, SE_FL_DETACHED); } -/* Endpoint upgrade failed. Retore the stconn state. */ +/* Endpoint upgrade failed. Restore the stconn state. */ void sc_conn_abort_endp_upgrade(struct stconn *sc) { sc_ep_set(sc, SE_FL_T_MUX); diff --git a/src/xprt_quic.c b/src/xprt_quic.c index b150b9f48..6cf848090 100644 --- a/src/xprt_quic.c +++ b/src/xprt_quic.c @@ -1749,7 +1749,7 @@ static inline void qc_requeue_nacked_pkt_tx_frms(struct quic_conn *qc, } /* Free TX packet and its attached frames. - * This is the responsability of the caller to remove this packet of + * This is the responsibility of the caller to remove this packet of * any data structure it was possibly attached to. */ static inline void free_quic_tx_packet(struct quic_tx_packet *pkt) @@ -2671,7 +2671,7 @@ static int qc_parse_pkt_frms(struct quic_rx_packet *pkt, struct ssl_sock_ctx *ct /* Must be called only by a writer (packet builder). * Return 1 if may be reused to build packets, depending on its and * internal indexes, 0 if not. When this is the case, reset writer - * index after having marked the end of written data. This the responsability + * index after having marked the end of written data. This the responsibility * of the caller to ensure there is enough room in to write the end of * data made of a uint16_t null field. * @@ -4832,7 +4832,7 @@ static int send_stateless_reset(struct listener *l, struct sockaddr_storage *dst /* QUIC server only function. * Add AAD to buffer from connection ID and socket address. - * This is the responsability of the caller to check size is big enough + * This is the responsibility of the caller to check size is big enough * to contain these data. * Return the number of bytes copied to . */ @@ -5198,7 +5198,7 @@ static int qc_conn_alloc_ssl_ctx(struct quic_conn *qc) } /* Check that all the bytes between included and address - * excluded are null. This is the responsability of the caller to + * excluded are null. This is the responsibility of the caller to * check that there is at least one byte between end . * Return 1 if this all the bytes are null, 0 if not. */ @@ -5216,7 +5216,7 @@ static inline int quic_padding_check(const unsigned char *buf, * with the information collected from the packet. * This function sets ->len field value to the end of the packet past one * byte to enable the caller to run this function again to continue to parse - * the remaing QUIC packets carried by the datagram. + * the remaining QUIC packets carried by the datagram. * Note that this function always sets this ->len value. If a paquet could * not be correctly found, ->len value will be set to the remaining number * bytes in the datagram to entirely consume this latter. @@ -6543,7 +6543,7 @@ struct task *quic_lstnr_dghdlr(struct task *t, void *ctx, unsigned int state) return t; } -/* Retreive the DCID from a QUIC datagram or packet with as first octet. +/* Retrieve the DCID from a QUIC datagram or packet with as first octet. * Returns 1 if succeeded, 0 if not. */ int quic_get_dgram_dcid(unsigned char *buf, const unsigned char *end,