CLEANUP: assorted typo fixes in the code and comments

This is 13n iteration of typo fixes

diff --git a/contrib/opentracing/README-pool b/contrib/opentracing/README-pool
index 09a6c156a370f732c686556aa9ce386c4e8daaf0..8164b04de10b9d6c201201ffa620b7ff63d4650f 100644 (file)
--- a/contrib/opentracing/README-pool
+++ b/contrib/opentracing/README-pool
@@ -16,7 +16,7 @@ By defining individual definitions in file include/config.h, it is possible to
 switch individual pools on / off.  If a particular pool is not used, memory is
 used in a 'normal' way instead, using malloc()/free() functions.
 
-This is made only from the aspect of debuging the program, i.e. comparing the
+This is made only from the aspect of debugging the program, i.e. comparing the
 speed of operation using different methods of working with memory.
 
 In general, it would be better to use memory pools, due to less fragmentation

diff --git a/include/haproxy/fix.h b/include/haproxy/fix.h
index 1d242e7ffc5e5aae98d53600727e5d63d0cad4a9..4b5928204e988468e7c1fc2b94d451a3794b04ed 100644 (file)
--- a/include/haproxy/fix.h
+++ b/include/haproxy/fix.h
@@ -32,7 +32,7 @@ int fix_validate_message(const struct ist msg);
 struct ist fix_tag_value(const struct ist msg, unsigned int tagid);
 
 /*
- * Return the FIX version string (one of FIX_X_Y macros) correspoding to
+ * Return the FIX version string (one of FIX_X_Y macros) corresponding to
  * <str> or IST_NULL if not found.
  */
 static inline struct ist fix_version(const struct ist str)

diff --git a/include/haproxy/http_ana-t.h b/include/haproxy/http_ana-t.h
index 4dce43d477f11f882bb68b63f8e8db538208d2f9..f41a593af3d373d96dccafc923ca02a34f67a73c 100644 (file)
--- a/include/haproxy/http_ana-t.h
+++ b/include/haproxy/http_ana-t.h
@@ -64,7 +64,7 @@
 
 #define TX_CON_WANT_TUN 0x00008000     /* Will be a tunnel (CONNECT or 101-Switching-Protocol) */
 
-/* unsued 0x00010000 */
+/* unused 0x00010000 */
 
 #define TX_USE_PX_CONN 0x00020000      /* Use "Proxy-Connection" instead of "Connection" */
 

diff --git a/include/haproxy/htx-t.h b/include/haproxy/htx-t.h
index 1b990260f50ee1570d20107533d257458eedf848..fb015752f5a8984ed3bfd81e0024a1925ecc9292 100644 (file)
--- a/include/haproxy/htx-t.h
+++ b/include/haproxy/htx-t.h
@@ -143,7 +143,7 @@
 #define HTX_FL_NONE              0x00000000
 #define HTX_FL_PARSING_ERROR     0x00000001 /* Set when a parsing error occurred */
 #define HTX_FL_PROCESSING_ERROR  0x00000002 /* Set when a processing error occurred */
-/* 0x00000004 unsused */
+/* 0x00000004 unused */
 #define HTX_FL_PROXY_RESP        0x00000008 /* Set when the response was generated by HAProxy */
 #define HTX_FL_EOI               0x00000010 /* Set when end-of-input is reached from the HTX point of view
                                             * (at worst, on the EOM block is missing)

diff --git a/include/haproxy/pattern.h b/include/haproxy/pattern.h
index 726dac83e255dfd2ee6bc0a3d65693aac51d9441..cfaadcafed5ebd3464e64ac005009e89586b50d1 100644 (file)
--- a/include/haproxy/pattern.h
+++ b/include/haproxy/pattern.h
@@ -78,7 +78,7 @@ int pat_idx_tree_pfx(struct pattern_expr *expr, struct pattern *pat, char **err)
 /*
  *
  * The following function deletes all patterns related to reference pattern
- * element <elt> in pattern refernce <ref>.
+ * element <elt> in pattern reference <ref>.
  *
  */
 void pat_delete_gen(struct pat_ref *ref, struct pat_ref_elt *elt);

diff --git a/reg-tests/log/log_uri.vtc b/reg-tests/log/log_uri.vtc
index 934a3ef107450ad82f7a0b833f074000486cda2c..00f0553d3aa2aced92871798e7c2aa865354e5f1 100644 (file)
--- a/reg-tests/log/log_uri.vtc
+++ b/reg-tests/log/log_uri.vtc
@@ -1,4 +1,4 @@
-varnishtest "Verify logging of relative/aboslute URI path"
+varnishtest "Verify logging of relative/absolute URI path"
 feature ignore_unknown_macro
 
 server s1 {

diff --git a/reg-tests/ssl/ssl_simple_crt-list.vtc b/reg-tests/ssl/ssl_simple_crt-list.vtc
index 76605e352e8e7fb0b36d85f07f950dbded7f0186..d3353a1295f1b718a92325667448dfdfe7387526 100644 (file)
--- a/reg-tests/ssl/ssl_simple_crt-list.vtc
+++ b/reg-tests/ssl/ssl_simple_crt-list.vtc
@@ -1,6 +1,6 @@
 #REGTEST_TYPE=bug
 varnishtest "Test for the bug #940"
-# Test that the SNI are correcly inserted with the same file multiple times.
+# Test that the SNI are correctly inserted with the same file multiple times.
 
 #REQUIRE_VERSION=2.2
 #REQUIRE_OPTIONS=OPENSSL

diff --git a/src/cache.c b/src/cache.c
index a833c044f2d8ee498166ebe5605b941240c3486f..705ed446cdc4e0cd35dcc1dbe0da5c686a3b0ced 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -77,7 +77,7 @@ typedef int(*http_header_normalizer)(struct ist value, char *buf, unsigned int *
 
 struct vary_hashing_information {
        struct ist hdr_name;                 /* Header name */
-       enum vary_header_bit value;          /* Bit repesenting the header in a vary signature */
+       enum vary_header_bit value;          /* Bit representing the header in a vary signature */
        unsigned int hash_length;            /* Size of the sub hash for this header's value */
        http_header_normalizer norm_fn;      /* Normalization function */
 };
@@ -839,7 +839,7 @@ static time_t get_last_modified_time(struct htx *htx)
 
 /*
  * Checks the vary header's value. The headers on which vary should be applied
- * must be explicitely supported in the vary_information array (see cache.c). If
+ * must be explicitly supported in the vary_information array (see cache.c). If
  * any other header is mentioned, we won't store the response.
  * Returns 1 if Vary-based storage can work, 0 otherwise.
  */
@@ -923,7 +923,7 @@ enum act_return http_action_store_cache(struct act_rule *rule, struct proxy *px,
                                break;
 
                        default: /* Any unsafe method */
-                               /* Discard any corresponding entry in case of sucessful
+                               /* Discard any corresponding entry in case of successful
                                 * unsafe request (such as PUT, POST or DELETE). */
                                shctx_lock(shctx);
 
@@ -1650,7 +1650,7 @@ enum act_return http_action_req_cache_use(struct act_rule *rule, struct proxy *p
        http_check_request_for_cacheability(s, &s->req);
 
        /* The request's hash has to be calculated for all requests, even POSTs
-        * or PUTs for instance because RFC7234 specifies that a sucessful
+        * or PUTs for instance because RFC7234 specifies that a successful
         * "unsafe" method on a stored resource must invalidate it
         * (see RFC7234#4.4). */
        if (!sha1_hosturi(s))

diff --git a/src/fix.c b/src/fix.c
index 82af1c0b9d84fbc12881be534d662764b429beb7..3ad3f2e8bf0a8d3df5f1b39f08dddc03def485cd 100644 (file)
--- a/src/fix.c
+++ b/src/fix.c
@@ -124,7 +124,7 @@ int fix_validate_message(const struct ist msg)
                        ret = FIX_NEED_MORE_DATA;
                        goto end;
                }
-               /* empty tag or empty value are forbbiden */
+               /* empty tag or empty value are forbidden */
                if (istptr(parser) == istptr(value) ||!istlen(value))
                        goto end;
 

diff --git a/src/log.c b/src/log.c
index 59d68a93ce55773a80da4e004d3d7681cbd26d8e..632e8bd80164861473c0bfe21ac2840aabc769ae 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -1483,7 +1483,7 @@ struct ist *build_log_header(enum log_fmt format, int level, int facility,
                        }
                        else if (metadata[LOG_META_TAG].len) {
                                /* Tag is present but no hostname, we should
-                                * consider we try to emmit a local log
+                                * consider we try to emit a local log
                                 * in legacy format (analog to RFC3164 but
                                 * with stripped hostname).
                                 */

diff --git a/src/mqtt.c b/src/mqtt.c
index c906fd43c9c49bcfa7755eb9b4b860d7b150bdc2..7679cbae6f56547939e8bd7719247c26bddde83b 100644 (file)
--- a/src/mqtt.c
+++ b/src/mqtt.c
@@ -326,7 +326,7 @@ static inline size_t mqtt_uint2str(struct buffer *buf, uint32_t i)
 }
 
 /* Extracts the value of a <fieldname_id> of type <type> from a given MQTT
- * message <msg>.  IST_NULL is returned if an error occured while parsing or if
+ * message <msg>.  IST_NULL is returned if an error occurred while parsing or if
  * the field could not be found. If more data are required, the message with a
  * length set to 0 is returned. If the field is found, the response is returned
  * as a struct ist.
@@ -858,7 +858,7 @@ static int mqtt_parse_connect(struct ist parser, struct mqtt_pkt *mpkt)
 
        /* parsing payload
         *
-        * Content of payload is realted to flags parsed above and the field order is pre-defined:
+        * Content of payload is related to flags parsed above and the field order is pre-defined:
         *   Client Identifier, Will Topic, Will Message, User Name, Password
         */
        /* read client identifier */

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 2c2611bdb04aa466e6a580bc626f00ed1c88d703..9998710f0fde750ccf4c9b808d33a3a1d0c26d18 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -1147,7 +1147,7 @@ static void fcgi_strm_wake_one_stream(struct fcgi_strm *fstrm)
        if (fcgi_conn_read0_pending(fconn)) {
                if (fstrm->state == FCGI_SS_OPEN) {
                        fstrm->state = FCGI_SS_HREM;
-                       TRACE_STATE("swtiching to HREM", FCGI_EV_STRM_WAKE|FCGI_EV_FSTRM_END, fconn->conn, fstrm);
+                       TRACE_STATE("switching to HREM", FCGI_EV_STRM_WAKE|FCGI_EV_FSTRM_END, fconn->conn, fstrm);
                }
                else if (fstrm->state == FCGI_SS_HLOC)
                        fcgi_strm_close(fstrm);

diff --git a/src/mux_h1.c b/src/mux_h1.c
index 65581589d728c217574774fb05019d69fc808134..81b0e0e30ced708271317323b6a1721f202b16a4 100644 (file)
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -55,13 +55,13 @@
 /* 0x00002000 - 0x00008000 unused */
 
 #define H1C_F_WAIT_OPPOSITE  0x00010000 /* Don't read more data for now, waiting sync with opposite side */
-#define H1C_F_WANT_SPLICE    0x00020000 /* Don't read into a bufffer because we want to use or we are using splicing */
+#define H1C_F_WANT_SPLICE    0x00020000 /* Don't read into a buffer because we want to use or we are using splicing */
 #define H1C_F_ERR_PENDING    0x00040000 /* Send an error and close the connection ASAP (implies H1C_F_ST_ERROR) */
 #define H1C_F_WAIT_NEXT_REQ  0x00080000 /*  waiting for the next request to start, use keep-alive timeout */
 #define H1C_F_UPG_H2C        0x00100000 /* set if an upgrade to h2 should be done */
 #define H1C_F_CO_MSG_MORE    0x00200000 /* set if CO_SFL_MSG_MORE must be set when calling xprt->snd_buf() */
 #define H1C_F_CO_STREAMER    0x00400000 /* set if CO_SFL_STREAMER must be set when calling xprt->snd_buf() */
-/* 0x00800000 - 0x40000000 unsued*/
+/* 0x00800000 - 0x40000000 unused */
 
 #define H1C_F_IS_BACK        0x80000000 /* Set on outgoing connection */
 
@@ -69,7 +69,7 @@
  * H1 Stream flags (32 bits)
  */
 #define H1S_F_NONE           0x00000000
-/* 0x00000001..0x00000004 unsued */
+/* 0x00000001..0x00000004 unused */
 #define H1S_F_REOS           0x00000008 /* End of input stream seen even if not delivered yet */
 #define H1S_F_WANT_KAL       0x00000010
 #define H1S_F_WANT_TUN       0x00000020

diff --git a/src/sample.c b/src/sample.c
index abf820bc7c02f319e3e7424b9de4d9b61422959b..d1941ce839c2c4a0a7d668c3e79041d1f249d477 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -3273,7 +3273,7 @@ static int sample_conv_fix_value_check(struct arg *args, struct sample_conv *con
  * Checks that a buffer contains a valid FIX message
  *
  * Return 1 if the check could be run, 0 if not.
- * The result of the analyse itsef is stored in <smp> as a boolean
+ * The result of the analyse itself is stored in <smp> as a boolean
  */
 static int sample_conv_fix_is_valid(const struct arg *arg_p, struct sample *smp, void *private)
 {
@@ -3334,7 +3334,7 @@ static int sample_conv_mqtt_field_value(const struct arg *arg_p, struct sample *
  * this function checks the "mqtt_field_value" converter configuration.
  * It expects a known packet type name or ID and a field name, in this order
  *
- * Args[0] will be turned into a MQTT_CPT_* value for direct maching when parsing
+ * Args[0] will be turned into a MQTT_CPT_* value for direct matching when parsing
  * a packet.
  */
 static int sample_conv_mqtt_field_value_check(struct arg *args, struct sample_conv *conv,

diff --git a/src/server.c b/src/server.c
index 3a3ccc672b144ac4b4cfd2d8eeec1a0d7c12aca1..15d88de8cf5ca37f555c99e342c9f7af3104c337 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -2952,7 +2952,7 @@ static void srv_update_state(struct server *srv, int version, char **params)
                                srv->svc_port = port;
 
 #ifdef USE_OPENSSL
-                       /* configure ssl if connection has been initated at startup */
+                       /* configure ssl if connection has been initiated at startup */
                        if (srv->ssl_ctx.ctx != NULL)
                                ssl_sock_set_srv(srv, use_ssl);
 #endif

diff --git a/src/stats.c b/src/stats.c
index 3f314440de6d0f064aa1278cfbb7a7840579b9f1..f597c1073b1d7f97112545978b9ba6cbef405042 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -3947,7 +3947,7 @@ static int stats_dump_info_to_buffer(struct stream_interface *si)
  * It returns 0 as long as it does not complete, non-zero upon completion.
  * No state is used.
  *
- * Integer values bouned to the range [-(2**53)+1, (2**53)-1] as
+ * Integer values bounded to the range [-(2**53)+1, (2**53)-1] as
  * per the recommendation for interoperable integers in section 6 of RFC 7159.
  */
 static void stats_dump_json_schema(struct buffer *out)