From a65c6d3574c749b4d78db5a6157258e40d35a8cd Mon Sep 17 00:00:00 2001 From: Ilia Shipitsin Date: Tue, 30 Apr 2024 16:11:27 +0200 Subject: [PATCH] CLEANUP: assorted typo fixes in the code and comments This is 42nd iteration of typo fixes --- doc/configuration.txt | 4 ++-- doc/management.txt | 4 ++-- include/haproxy/peers-t.h | 2 +- include/haproxy/stats-file.h | 2 +- include/haproxy/stats-t.h | 2 +- reg-tests/ssl/ocsp_auto_update.vtc | 2 +- src/haproxy.c | 2 +- src/peers.c | 2 +- src/quic_tx.c | 2 +- src/stats-file.c | 2 +- src/stats.c | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/configuration.txt b/doc/configuration.txt index 461ba261f..10b8cce97 100644 --- a/doc/configuration.txt +++ b/doc/configuration.txt @@ -4754,7 +4754,7 @@ httpclient.timeout.connect 3.12. Certificate Storage ------------------------- -HAProxy uses an internal storage mecanism to load and store certificates used +HAProxy uses an internal storage mechanism to load and store certificates used in the configuration. This storage can be configured by using a "crt-store" section. It allows to configure certificate definitions and which files should be loaded in it. A certificate definition must be written before it is used @@ -25767,7 +25767,7 @@ Flags are : as-is and '+E' option will be ignored. When combined with '+bin' option, it will directly generate raw binary CBOR payload. Be careful, because it will obviously generate - non-printable chars, thus it is mainly intented for use with + non-printable chars, thus it is mainly intended for use with set-var-fmt, rings and binary-capable log endpoints. Example: diff --git a/doc/management.txt b/doc/management.txt index 7f2de3d71..1b336a4c1 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -4251,7 +4251,7 @@ show startup-logs A so-called stats-file can be used to preload internal haproxy counters on process startup with non-null values. Its main purpose is to preserve -statistics for worker processes accross reloads. Only an excerpt of all the +statistics for worker processes across reloads. Only an excerpt of all the exposed haproxy statistics is present in a stats-file as it only makes sense to preload metric-type values. @@ -4263,7 +4263,7 @@ even if other parameters differ. The CLI command "dump stats-file" purpose is to generate a stats-file. Format of the stats-file is internally defined and freely subject to future changes -and extension. It is designed to be compatible at least accross adjacent +and extension. It is designed to be compatible at least across adjacent haproxy stable branch releases, but may require optional extra configuration when loading a stats-file to a process running on an older version. diff --git a/include/haproxy/peers-t.h b/include/haproxy/peers-t.h index 85206ebee..19619d0a1 100644 --- a/include/haproxy/peers-t.h +++ b/include/haproxy/peers-t.h @@ -56,7 +56,7 @@ enum peer_learn_state { #define PEERS_F_RESYNC_LOCAL_FINISHED 0x00000001 /* Learn from local peer finished or no more needed */ #define PEERS_F_RESYNC_REMOTE_FINISHED 0x00000002 /* Learn from remote peer finished or no more needed */ #define PEERS_F_RESYNC_ASSIGN 0x00000004 /* A peer was assigned to learn our lesson */ -/* unsued 0x00000008..0x00080000 */ +/* unused 0x00000008..0x00080000 */ #define PEERS_F_DBG_RESYNC_LOCALTIMEOUT 0x00100000 /* Timeout waiting for a full resync from a local node was experienced at lest once (for debugging purpose) */ #define PEERS_F_DBG_RESYNC_REMOTETIMEOUT 0x00200000 /* Timeout waiting for a full resync from a remote node was experienced at lest once (for debugging purpose) */ #define PEERS_F_DBG_RESYNC_LOCALABORT 0x00400000 /* Session aborted learning from a local node was experienced at lest once (for debugging purpose) */ diff --git a/include/haproxy/stats-file.h b/include/haproxy/stats-file.h index 25454d5a2..d3853b4aa 100644 --- a/include/haproxy/stats-file.h +++ b/include/haproxy/stats-file.h @@ -14,7 +14,7 @@ int stats_dump_fields_file(struct buffer *out, void stats_dump_file_header(int type, struct buffer *out); -/* Maximun number of parsed stat column in a header line. +/* Maximum number of parsed stat column in a header line. * Directly based on ST_I_PX_MAX, with value doubled to obtain compatibility * between haproxy adjacent versions. */ diff --git a/include/haproxy/stats-t.h b/include/haproxy/stats-t.h index 204401a84..d4d01e970 100644 --- a/include/haproxy/stats-t.h +++ b/include/haproxy/stats-t.h @@ -551,7 +551,7 @@ enum stats_domain_px_cap { STATS_PX_CAP_MASK = 0xff }; -/* Shorcut names for enum stats_domain_px_cap only for declaration convenience */ +/* Shortcut names for enum stats_domain_px_cap only for declaration convenience */ #define STATS_PX_CAP_LFBS (STATS_PX_CAP_MASK) #define STATS_PX_CAP_LFB_ (STATS_PX_CAP_FE|STATS_PX_CAP_BE|STATS_PX_CAP_LI) #define STATS_PX_CAP_LF__ (STATS_PX_CAP_FE|STATS_PX_CAP_LI) diff --git a/reg-tests/ssl/ocsp_auto_update.vtc b/reg-tests/ssl/ocsp_auto_update.vtc index 72d20fe60..214c63e69 100644 --- a/reg-tests/ssl/ocsp_auto_update.vtc +++ b/reg-tests/ssl/ocsp_auto_update.vtc @@ -16,7 +16,7 @@ # # The ocsp responder used in all the tests will be an openssl using the # certificate database in ocsp_update/index.txt. It will listen on port 12345 -# which was specified explicitely in the certificates used in the tests. +# which was specified explicitly in the certificates used in the tests. # The synchronization will be based on the logs emitted by the OCSP update task # directly. When this log is created, we will know that the update was # effective and the updated OCSP response is loaded in the tree. So any diff --git a/src/haproxy.c b/src/haproxy.c index 8cc897e75..fb85cf442 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -769,7 +769,7 @@ static void mworker_reexec(int hardreload) /* copy the program name */ next_argv[next_argc++] = old_argv[0]; - /* we need to reintroduce /dev/null everytime */ + /* we need to reintroduce /dev/null every time */ if (old_unixsocket && strcmp(old_unixsocket, "/dev/null") == 0) x_off = 1; diff --git a/src/peers.c b/src/peers.c index a7d03d42d..4ec981cad 100644 --- a/src/peers.c +++ b/src/peers.c @@ -3291,7 +3291,7 @@ static void sync_peer_learn_state(struct peers *peers, struct peer *peer) if (peer->learnstate != PEER_LR_ST_FINISHED) return; - /* The learning process is now fnished */ + /* The learning process is now finished */ if (peer->flags & PEER_F_LEARN_NOTUP2DATE) { /* Partial resync */ flags |= (peer->local ? PEERS_F_DBG_RESYNC_LOCALPARTIAL : PEERS_F_DBG_RESYNC_REMOTEPARTIAL); diff --git a/src/quic_tx.c b/src/quic_tx.c index ba81a7713..d50b52f70 100644 --- a/src/quic_tx.c +++ b/src/quic_tx.c @@ -685,7 +685,7 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf, * specified via quic_enc_level through their send_frms member. Set * when reemitted duplicated data. * -* Returns 1 on success else 0. Note that will always be resetted +* Returns 1 on success else 0. Note that will always be reset * after qc_send() exit. */ int qc_send(struct quic_conn *qc, int old_data, struct list *send_list) diff --git a/src/stats-file.c b/src/stats-file.c index c63916ea0..76168919d 100644 --- a/src/stats-file.c +++ b/src/stats-file.c @@ -114,7 +114,7 @@ void stats_dump_file_header(int type, struct buffer *out) * using as prefilled proxy stats columns. If stats-file section is * unknown, only will be set to STFILE_DOMAIN_UNSET. * - * Returns 0 on sucess. On fatal error, non-zero is returned and parsing shoud + * Returns 0 on success. On fatal error, non-zero is returned and parsing should * be interrupted. */ static int parse_header_line(struct ist header, struct eb_root *st_tree, diff --git a/src/stats.c b/src/stats.c index 2baffc586..5db9c2631 100644 --- a/src/stats.c +++ b/src/stats.c @@ -1026,7 +1026,7 @@ static int cli_io_handler_dump_stat_file(struct appctx *appctx) struct show_stat_ctx *ctx = appctx->svcctx; int ret; - /* Frontend and backend sides are ouputted separatedly on stats-file. + /* Frontend and backend sides are outputted separately on stats-file. * As such, use STAT_F_BOUND to restrict proxies looping over frontend * side first before first stats_dump_stat_to_buffer(). A second * iteration is conducted for backend side after.