CLEANUP: assorted typo fixes in the code and comments
This is fifth iteration of typo fixes
diff --git a/contrib/deviceatlas/dac.h b/contrib/deviceatlas/dac.h
index 4e0189a..92a9396 100644
--- a/contrib/deviceatlas/dac.h
+++ b/contrib/deviceatlas/dac.h
@@ -70,7 +70,7 @@
enum da_severity {
DA_SEV_FATAL, /* The operation will not continue, and the operation will return an error. */
DA_SEV_ERROR, /* An error occurred, but the API call will return at least some valid information */
- DA_SEV_WARN, /* An unexpected event occured, but the system dealt with it */
+ DA_SEV_WARN, /* An unexpected event occurred, but the system dealt with it */
DA_SEV_INFO /* An informational message. */
};
/* Forward references to tagged types */
diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c
index 94e6d6b..079e880 100644
--- a/contrib/mod_defender/spoa.c
+++ b/contrib/mod_defender/spoa.c
@@ -192,7 +192,7 @@
DEBUG(frame->worker, "<%lu> Supported versions : %.*s",
frame->client->id, (int)sz, str);
- /* TODO: Find the right verion in supported ones */
+ /* TODO: Find the right version in supported ones */
ret = (p - *buf);
*buf = p;
diff --git a/contrib/modsecurity/modsec_wrapper.c b/contrib/modsecurity/modsec_wrapper.c
index a3a2541..7ae831e 100644
--- a/contrib/modsecurity/modsec_wrapper.c
+++ b/contrib/modsecurity/modsec_wrapper.c
@@ -140,7 +140,7 @@
modsec_server = modsecInit();
if (modsec_server == NULL) {
- LOG(&null_worker, "ModSecurity initilisation failed.\n");
+ LOG(&null_worker, "ModSecurity initialisation failed.\n");
return -1;
}
@@ -153,7 +153,7 @@
modsec_config = modsecGetDefaultConfig();
if (modsec_config == NULL) {
- LOG(&null_worker, "ModSecurity default configuration initilisation failed.\n");
+ LOG(&null_worker, "ModSecurity default configuration initialisation failed.\n");
return -1;
}
diff --git a/contrib/modsecurity/spoa.c b/contrib/modsecurity/spoa.c
index 225db29..20916fd 100644
--- a/contrib/modsecurity/spoa.c
+++ b/contrib/modsecurity/spoa.c
@@ -197,7 +197,7 @@
DEBUG(frame->worker, "<%lu> Supported versions : %.*s",
frame->client->id, (int)sz, str);
- /* TODO: Find the right verion in supported ones */
+ /* TODO: Find the right version in supported ones */
ret = (p - *buf);
*buf = p;
diff --git a/contrib/plug_qdisc/plug_qdisc.c b/contrib/plug_qdisc/plug_qdisc.c
index 606a834..bc47f5d 100644
--- a/contrib/plug_qdisc/plug_qdisc.c
+++ b/contrib/plug_qdisc/plug_qdisc.c
@@ -10,7 +10,7 @@
* XXX Please, first note that this code is not safe. XXX
* It was developed fast so that to reproduce a bug.
* You will certainly have to adapt it to your application.
- * But at least it gives an idea about how to programatically use plug
+ * But at least it gives an idea about how to programmatically use plug
* queueing disciplines.
*/
diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 6e7eca0..8ffeb82 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -73,7 +73,7 @@
#define PROMEX_FL_SCOPE_ALL (PROMEX_FL_SCOPE_GLOBAL|PROMEX_FL_SCOPE_FRONT|PROMEX_FL_SCOPE_BACK|PROMEX_FL_SCOPE_SERVER)
/* The max length for metrics name. It is a hard limit but it should be
- * enougth.
+ * enough.
*/
#define PROMEX_MAX_NAME_LEN 128
@@ -615,7 +615,7 @@
const struct ist promex_inf_metric_desc[INF_TOTAL_FIELDS] = {
[INF_NAME] = IST("Product name."),
[INF_VERSION] = IST("HAProxy version."),
- [INF_RELEASE_DATE] = IST("HAProxy realease date."),
+ [INF_RELEASE_DATE] = IST("HAProxy release date."),
[INF_NBTHREAD] = IST("Configured number of threads."),
[INF_NBPROC] = IST("Configured number of processes."),
[INF_PROCESS_NUM] = IST("Relative process id, starting at 1."),
@@ -627,7 +627,7 @@
[INF_POOL_USED_MB] = IST("Total amount of memory used in pools (in bytes)."),
[INF_POOL_FAILED] = IST("Total number of failed pool allocations."),
[INF_ULIMIT_N] = IST("Maximum number of open file descriptors; 0=unset."),
- [INF_MAXSOCK] = IST("Maximum numer of open sockets."),
+ [INF_MAXSOCK] = IST("Maximum number of open sockets."),
[INF_MAXCONN] = IST("Maximum number of concurrent connections."),
[INF_HARD_MAXCONN] = IST("Initial Maximum number of concurrent connections."),
[INF_CURR_CONN] = IST("Number of active sessions."),
@@ -1140,7 +1140,7 @@
/* Concatenate the <prefix> with the field name using the array
* <promex_st_metric_names> and store it in <name>. The field type is in
* <appctx->st2>. This function never fails but relies on
- * <PROMEX_MAX_NAME_LEN>. So by sure the result is small enougth to be copied in
+ * <PROMEX_MAX_NAME_LEN>. So by sure the result is small enough to be copied in
* <name>
*/
static void promex_metric_name(struct appctx *appctx, struct ist *name, const struct ist prefix)
@@ -1252,7 +1252,7 @@
}
-/* Dump global metrics (prefixed by "haproxy_process_"). It returns 1 on sucess,
+/* Dump global metrics (prefixed by "haproxy_process_"). It returns 1 on success,
* 0 if <htx> is full and -1 in case of any error. */
static int promex_dump_global_metrics(struct appctx *appctx, struct htx *htx)
{
@@ -1465,7 +1465,7 @@
goto end;
}
-/* Dump frontends metrics (prefixed by "haproxy_frontend_"). It returns 1 on sucess,
+/* Dump frontends metrics (prefixed by "haproxy_frontend_"). It returns 1 on success,
* 0 if <htx> is full and -1 in case of any error. */
static int promex_dump_front_metrics(struct appctx *appctx, struct htx *htx)
{
@@ -1648,7 +1648,7 @@
goto end;
}
-/* Dump backends metrics (prefixed by "haproxy_backend_"). It returns 1 on sucess,
+/* Dump backends metrics (prefixed by "haproxy_backend_"). It returns 1 on success,
* 0 if <htx> is full and -1 in case of any error. */
static int promex_dump_back_metrics(struct appctx *appctx, struct htx *htx)
{
@@ -1892,7 +1892,7 @@
goto end;
}
-/* Dump servers metrics (prefixed by "haproxy_server_"). It returns 1 on sucess,
+/* Dump servers metrics (prefixed by "haproxy_server_"). It returns 1 on success,
* 0 if <htx> is full and -1 in case of any error. */
static int promex_dump_srv_metrics(struct appctx *appctx, struct htx *htx)
{
@@ -2243,7 +2243,7 @@
return -1;
}
-/* Parse the query stirng of request URI to filter the metrics. It returns 1 on
+/* Parse the query string of request URI to filter the metrics. It returns 1 on
* success and -1 on error. */
static int promex_parse_uri(struct appctx *appctx, struct stream_interface *si)
{
@@ -2401,7 +2401,7 @@
if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO))
goto out;
- /* Check if the input buffer is avalaible. */
+ /* Check if the input buffer is available. */
if (!b_size(&res->buf)) {
si_rx_room_blk(si);
goto out;
diff --git a/contrib/spoa_example/include/spoe_types.h b/contrib/spoa_example/include/spoe_types.h
index 8f93edd..a986227 100644
--- a/contrib/spoa_example/include/spoe_types.h
+++ b/contrib/spoa_example/include/spoe_types.h
@@ -100,7 +100,7 @@
SPOE_CTX_ERRS,
};
-/* Errors triggerd by SPOE applet */
+/* Errors triggered by SPOE applet */
enum spoe_frame_error {
SPOE_FRM_ERR_NONE = 0,
SPOE_FRM_ERR_IO,
diff --git a/contrib/spoa_example/spoa.c b/contrib/spoa_example/spoa.c
index f32ac44..dd4a873 100644
--- a/contrib/spoa_example/spoa.c
+++ b/contrib/spoa_example/spoa.c
@@ -246,7 +246,7 @@
DEBUG(frame->worker, "<%lu> Supported versions : %.*s",
frame->client->id, (int)sz, str);
- /* TODO: Find the right verion in supported ones */
+ /* TODO: Find the right version in supported ones */
ret = (p - *buf);
*buf = p;
diff --git a/contrib/spoa_server/ps_lua.c b/contrib/spoa_server/ps_lua.c
index e7de2d9..2d37d9b 100644
--- a/contrib/spoa_server/ps_lua.c
+++ b/contrib/spoa_server/ps_lua.c
@@ -396,7 +396,7 @@
lua_pop(L, 1);
return 0;
default:
- fprintf(stderr, "lua unknonwn error: %s\n", lua_tostring(L, 0));
+ fprintf(stderr, "lua unknown error: %s\n", lua_tostring(L, 0));
lua_pop(L, 1);
return 0;
}
@@ -488,7 +488,7 @@
case LUA_ERRERR:
msg_fmt = msg_fmt ? msg_fmt : "Lua message handler error";
default:
- msg_fmt = msg_fmt ? msg_fmt : "Lua unknonwn error";
+ msg_fmt = msg_fmt ? msg_fmt : "Lua unknown error";
msg = lua_tostring(L, -1);
if (msg == NULL)
msg = "Unknown error";
diff --git a/contrib/spoa_server/ps_python.c b/contrib/spoa_server/ps_python.c
index 0a9fbff..2dbe5ee 100644
--- a/contrib/spoa_server/ps_python.c
+++ b/contrib/spoa_server/ps_python.c
@@ -50,7 +50,7 @@
if (!PyArg_ParseTuple(args, "sO!", &name, &PyFunction_Type, &ref))
return NULL;
- Py_XINCREF(ref); /* because the function is intenally refrenced */
+ Py_XINCREF(ref); /* because the function is internally referenced */
ps_register_message(&ps_python_bindings, name, (void *)ref);
@@ -602,7 +602,7 @@
}
}
- /* Dictionnary { args = <list-of-args> } for the function */
+ /* Dictionary { args = <list-of-args> } for the function */
fkw = PyDict_New();
if (fkw == NULL) {
diff --git a/contrib/spoa_server/spoa.c b/contrib/spoa_server/spoa.c
index f36c3db..9a8ffd0 100644
--- a/contrib/spoa_server/spoa.c
+++ b/contrib/spoa_server/spoa.c
@@ -51,7 +51,7 @@
SPOE_FRM_T_AGENT_ACK
};
-/* Errors triggerd by SPOE applet */
+/* Errors triggered by SPOE applet */
enum spoe_frame_error {
SPOE_FRM_ERR_NONE = 0,
SPOE_FRM_ERR_IO,
@@ -501,7 +501,7 @@
return -1;
}
- /* TODO: Find the right verion in supported ones */
+ /* TODO: Find the right version in supported ones */
return idx;
}
@@ -822,7 +822,7 @@
}
/* This function is a little bit ugly,
- * TODO: improve the response without copying the bufer
+ * TODO: improve the response without copying the buffer
*/
static int commit_agentack(struct worker *w)
{
@@ -872,7 +872,7 @@
DEBUG("Notify frame received: stream-id=%u - frame-id=%u",
w->stream_id, w->frame_id);
- /* Prepara ack, if the processing fails tha ack will be cancelled */
+ /* Prepare ack, if the processing fails the ack will be cancelled */
prepare_agentack(w);
/* Loop on messages */
@@ -915,7 +915,7 @@
idx += i;
}
- /* Lookup for existsing bindings. If no existing message
+ /* Lookup for existing bindings. If no existing message
* where found, does nothing.
*/
for (msg = ps_messages; msg; msg = msg->next)
diff --git a/contrib/wireshark-dissectors/peers/packet-happp.c b/contrib/wireshark-dissectors/peers/packet-happp.c
index 980e290..33263b4 100644
--- a/contrib/wireshark-dissectors/peers/packet-happp.c
+++ b/contrib/wireshark-dissectors/peers/packet-happp.c
@@ -158,7 +158,7 @@
};
/* The types of data we can store in a stick table.
- * Same defintions as in HAProxy sources.
+ * Same definitions as in HAProxy sources.
*/
enum {
STKT_DT_SERVER_ID, /* the server ID to use with this stream if > 0 */
diff --git a/contrib/wurfl/wurfl/wurfl.h b/contrib/wurfl/wurfl/wurfl.h
index ca512da..3b450fc 100644
--- a/contrib/wurfl/wurfl/wurfl.h
+++ b/contrib/wurfl/wurfl/wurfl.h
@@ -322,7 +322,7 @@
wurfl_error wurfl_updater_set_data_frequency(wurfl_handle hwurfl, wurfl_updater_frequency freq);
// Set updater timeouts.
-// There are two timeouts, both in miliseconds : connection timeout and operation timeout.
+// There are two timeouts, both in milliseconds : connection timeout and operation timeout.
// The values are mapped to CURL --connect-timeout and --max-time parameters
// (after millisecs-to-secs conversion). Note that CURL sub millisecond timeouts don't work for
// lack of a way to specify decimal values for timeout to curl (using 0.05 for example fails to work