Skip to content

Commit

Permalink
CLEANUP: assorted typo fixes in the code and comments
Browse files Browse the repository at this point in the history
This is 41st iteration of typo fixes
  • Loading branch information
chipitsine authored and wtarreau committed Apr 17, 2024
1 parent 2bb9e3b commit ab7f05d
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions doc/configuration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6739,7 +6739,7 @@ fullconn <conns>

guid <string>
Specify a case-sensitive global unique ID for this proxy. This must be unique
accross all haproxy configuration on every object types. Format is left
across all haproxy configuration on every object types. Format is left
unspecified to allow the user to select its naming policy. The only
restriction is its length which cannot be greater than 127 characters. All
alphanumerical values and '.', ':', '-' and '_' characters are valid.
Expand Down Expand Up @@ -17000,7 +17000,7 @@ force-tlsv13

guid <string>
Specify a case-sensitive global unique ID for this server. This must be
unique accross all haproxy configuration on every object types. See "guid"
unique across all haproxy configuration on every object types. See "guid"
proxy keyword description for more information on its format.

id <value>
Expand Down
2 changes: 1 addition & 1 deletion include/haproxy/cli-t.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ enum {
CLI_ST_INIT = 0, /* initial state, must leave to zero ! */
CLI_ST_END, /* final state, let's close */
CLI_ST_GETREQ, /* wait for a request */
CLI_ST_PARSEREQ, /* pase a request */
CLI_ST_PARSEREQ, /* parse a request */
CLI_ST_OUTPUT, /* all states after this one are responses */
CLI_ST_PROMPT, /* display the prompt (first output, same code) */
CLI_ST_PRINT, /* display const message in cli->msg */
Expand Down
2 changes: 1 addition & 1 deletion include/haproxy/session.h
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ static inline int session_add_conn(struct session *sess, struct connection *conn
}
LIST_APPEND(&pconns->conn_list, &conn->sess_el);

/* Ensure owner is set for connection. It could have been resetted
/* Ensure owner is set for connection. It could have been reset
* prior on after a session_add_conn() failure.
*/
conn->owner = sess;
Expand Down
2 changes: 1 addition & 1 deletion include/haproxy/vecpair.h
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ static inline size_t vp_get_varint_ofs(struct ist *v1, struct ist *v2, size_t of

vp_skip(v1, v2, ofs);

/* let's see where we start from. The wraping area only concerns the
/* let's see where we start from. The wrapping area only concerns the
* end of the first area, even if it's empty it does not overlap with
* the second one so we don't care about v1 being set or not.
*/
Expand Down
2 changes: 1 addition & 1 deletion reg-tests/ssl/ocsp_auto_update.vtc
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ process p7 -wait

######################
# #
# EIGTH TEST CASE #
# EIGHTH TEST CASE #
# #
######################

Expand Down
2 changes: 1 addition & 1 deletion src/haproxy.c
Original file line number Diff line number Diff line change
Expand Up @@ -3490,7 +3490,7 @@ int main(int argc, char **argv)
#if defined(USE_LINUX_CAP)
/* If CAP_NET_BIND_SERVICE is in binary file permitted set and process
* is started and run under the same non-root user, this allows
* binding to priviledged ports.
* binding to privileged ports.
*/
prepare_caps_from_permitted_set(geteuid(), global.uid, argv[0]);
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/linuxcap.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static uint32_t caplist;
* will be unset by the same reason.
* We do this only if the current euid is non-root and there is no global.uid.
* Otherwise the process will continue either to run under root, or it will do
* a transition to unpriviledged user later in prepare_caps_for_setuid(),
* a transition to unprivileged user later in prepare_caps_for_setuid(),
* which specially manages its capabilities in that case.
* Always returns 0. Diagnostic warnings will be emitted only, if
* LSTCHK_NETADM is presented in LSTCHK_NETADM and some failures are
Expand Down
2 changes: 1 addition & 1 deletion src/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ static int add_sample_to_logformat_list(char *text, char *name, int name_len, in
*
* lf_expr: the destination logformat expression (logformat_node list)
* which is supposed to be configured (str and conf set) but
* shouldn't be compiled (shoudn't contain any nodes)
* shouldn't be compiled (shouldn't contain any nodes)
* al: arg list where sample expr should store arg dependency (if the logformat
* expression involves sample expressions), may be NULL
* options: LOG_OPT_* to force on every node
Expand Down
2 changes: 1 addition & 1 deletion src/ring.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void ring_init(struct ring *ring, void *area, size_t size, int reset)
* If <area> is null, then it's allocated of the requested size. The ring
* storage struct is part of the area so the usable area is slightly reduced.
* However the storage is immediately adjacent to the struct so that the ring
* remains consistent on-disk. ring_free() will ignore such ring stoages and
* remains consistent on-disk. ring_free() will ignore such ring storages and
* will only release the ring part, so the caller is responsible for releasing
* them. If <reset> is non-zero, the storage area is reset, otherwise it's left
* intact.
Expand Down

0 comments on commit ab7f05d

Please sign in to comment.