spelling corrections documented in redmine bug#533

diff --git a/libhtp/htp/htp_util.c b/libhtp/htp/htp_util.c
index 09775a7000f505b5c040b1c13a87015f09577aa1..8e2864ce50273ba4cb1a69238ddea4b7050fbe5d 100644 (file)
--- a/libhtp/htp/htp_util.c
+++ b/libhtp/htp/htp_util.c
@@ -1710,7 +1710,7 @@ char *htp_tx_progress_as_string(htp_tx_t *tx) {
             return "DONE";
     }
 
-    return "UNKOWN";
+    return "UNKNOWN";
 }
 
 bstr *htp_unparse_uri_noencode(htp_uri_t *uri) {

diff --git a/src/alert-pcapinfo.c b/src/alert-pcapinfo.c
index 8e5700338e7e6d34e8d58e50244d307b8ef7721b..a953de8ce004c768b03243f42eafee6b8d43df28 100644 (file)
--- a/src/alert-pcapinfo.c
+++ b/src/alert-pcapinfo.c
@@ -21,7 +21,7 @@
  * \author Eric Leblond <eric@regit.org>
  *
  * Logs alerts in a line based text format suitable for interaction
- * with wireshark or an other pcap file analysis tools.
+ * with wireshark or another pcap file analysis tools.
  *
  * The format of the logging is:
  *  Packet number:GID of matching signature:SID of signature:REV of signature:Flow:To Server:To Client:0:0:Signature Message

diff --git a/src/detect-depth.c b/src/detect-depth.c
index 85fadb69e8d2f6daa3bdd40de1a88e64021b48cc..a6c4b31c0d7fab79019a0364dace2e432bbb2255 100644 (file)
--- a/src/detect-depth.c
+++ b/src/detect-depth.c
@@ -76,7 +76,7 @@ static int DetectDepthSetup (DetectEngineCtx *de_ctx, Signature *s, char *depths
                     DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_PMATCH]);
             if (pm == NULL) {
                 SCLogError(SC_ERR_DEPTH_MISSING_CONTENT, "depth needs "
-                           "preceeding content option for dcerpc sig");
+                           "preceding content option for dcerpc sig");
                 if (dubbed)
                     SCFree(str);
                 return -1;
@@ -100,7 +100,7 @@ static int DetectDepthSetup (DetectEngineCtx *de_ctx, Signature *s, char *depths
                     DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HUADMATCH]);
             if (pm == NULL) {
                 SCLogError(SC_ERR_DEPTH_MISSING_CONTENT, "depth needs "
-                        "preceeding content, uricontent option, http_client_body, "
+                        "preceding content, uricontent option, http_client_body, "
                         "http_server_body, http_header option, http_raw_header option, "
                         "http_method option, http_cookie, http_raw_uri, "
                         "http_stat_msg, http_stat_code or http_user_agent option");
@@ -177,7 +177,7 @@ static int DetectDepthSetup (DetectEngineCtx *de_ctx, Signature *s, char *depths
             break;
 
         default:
-            SCLogError(SC_ERR_DEPTH_MISSING_CONTENT, "depth needs a preceeding "
+            SCLogError(SC_ERR_DEPTH_MISSING_CONTENT, "depth needs a preceding "
                     "content (or uricontent) option");
             goto error;
     }

diff --git a/src/detect-distance.c b/src/detect-distance.c
index fbcd969c432e06a608ef3e954bc6348582b5efa8..75220670a45a35151847cdce24028e4f5a9b0cad 100644 (file)
--- a/src/detect-distance.c
+++ b/src/detect-distance.c
@@ -175,7 +175,7 @@ static int DetectDistanceSetup (DetectEngineCtx *de_ctx, Signature *s,
                 DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HUADMATCH]);
         if (pm == NULL) {
             SCLogError(SC_ERR_WITHIN_MISSING_CONTENT, "within needs "
-                       "preceeding content, uricontent option, http_client_body, "
+                       "preceding content, uricontent option, http_client_body, "
                        "http_server_body, http_header, http_raw_header, http_method, "
                        "http_cookie, http_raw_uri, http_stat_msg, http_stat_code "
                        "or http_user_agent option");
@@ -193,7 +193,7 @@ static int DetectDistanceSetup (DetectEngineCtx *de_ctx, Signature *s,
             cd = (DetectContentData *)pm->ctx;
             if (cd == NULL) {
                 SCLogError(SC_ERR_DISTANCE_MISSING_CONTENT, "distance needs two "
-                "preceeding content or uricontent options");
+                "preceding content or uricontent options");
                 goto error;
             }
 
@@ -305,7 +305,7 @@ static int DetectDistanceSetup (DetectEngineCtx *de_ctx, Signature *s,
 
         default:
             SCLogError(SC_ERR_DISTANCE_MISSING_CONTENT, "distance needs two "
-                       "preceeding content or uricontent options");
+                       "preceding content or uricontent options");
             goto error;
     }
 

diff --git a/src/detect-dsize.c b/src/detect-dsize.c
index 3784e0a5a35337da3a11ac161c14ef2d73b1b268..d8a1afcfe715bcf57e651c066a7209fd4f026545 100644 (file)
--- a/src/detect-dsize.c
+++ b/src/detect-dsize.c
@@ -231,7 +231,7 @@ DetectDsizeData *DetectDsizeParse (char *rawstr)
         }
     }
 
-    SCLogDebug("dsize parsed succesfully dsize: %"PRIu16" dsize2: %"PRIu16"",dd->dsize,dd->dsize2);
+    SCLogDebug("dsize parsed successfully dsize: %"PRIu16" dsize2: %"PRIu16"",dd->dsize,dd->dsize2);
 
     SCFree(value1);
     SCFree(mode);

diff --git a/src/detect-engine-siggroup.c b/src/detect-engine-siggroup.c
index 3c7ccad8a7fe4ccb86e11b63f22765384d6c253d..d42a6d69f7d56d377422548eb72ef714fd132ed5 100644 (file)
--- a/src/detect-engine-siggroup.c
+++ b/src/detect-engine-siggroup.c
@@ -1284,7 +1284,7 @@ void SigGroupHeadPrintContentCnt(DetectEngineCtx *de_ctx, SigGroupHead *sgh)
  * \param sgh    Pointer to the SigGroupHead.
  *
  * \retval  0 On success, i.e. on either the detection engine context being NULL
- *            or on succesfully allocating memory and updating it with relevant
+ *            or on successfully allocating memory and updating it with relevant
  *            data.
  * \retval -1 On failure.
  */
@@ -1364,7 +1364,7 @@ int SigGroupHeadClearContent(SigGroupHead *sh)
  * \param sgh    Pointer to the SigGroupHead.
  *
  * \retval  0 On success, i.e. on either the detection engine context being NULL
- *            or on succesfully allocating memory and updating it with relevant
+ *            or on successfully allocating memory and updating it with relevant
  *            data.
  * \retval -1 On failure.
  */
@@ -1444,7 +1444,7 @@ int SigGroupHeadClearUricontent(SigGroupHead *sh)
  * \param sgh    Pointer to the SigGroupHead.
  *
  * \retval  0 On success, i.e. on either the detection engine context being NULL
- *            or on succesfully allocating memory and updating it with relevant
+ *            or on successfully allocating memory and updating it with relevant
  *            data.
  * \retval -1 On failure.
  */

diff --git a/src/detect-http-cookie.c b/src/detect-http-cookie.c
index 227ea0910dfb8ebc174fcea007e92eb194ebfecf..0d1b9d99a2b46a74d1fcb9102eae3cab30465502 100644 (file)
--- a/src/detect-http-cookie.c
+++ b/src/detect-http-cookie.c
@@ -169,7 +169,7 @@ static int DetectHttpCookieSetup (DetectEngineCtx *de_ctx, Signature *s, char *s
                                         s->sm_lists_tail[DETECT_SM_LIST_HCDMATCH]);
         if (pm == NULL) {
             SCLogError(SC_ERR_HTTP_COOKIE_RELATIVE_MISSING, "http_cookie with "
-                    "a distance or within requires preceeding http_cookie "
+                    "a distance or within requires preceding http_cookie "
                     "content, but none was found");
             goto error;
         }

diff --git a/src/detect-http-method.c b/src/detect-http-method.c
index 9815d931a43c3c3bdd3a8abfde500d691d623a6a..c2968d906932441737ebca2599cdeac1c60d8994 100644 (file)
--- a/src/detect-http-method.c
+++ b/src/detect-http-method.c
@@ -103,7 +103,7 @@ static int DetectHttpMethodSetup(DetectEngineCtx *de_ctx, Signature *s, char *st
 
     if (s->sm_lists_tail[DETECT_SM_LIST_PMATCH] == NULL) {
         SCLogError(SC_ERR_HTTP_METHOD_NEEDS_PRECEEDING_CONTENT, "http_method "
-                "modifies preceeding \"content\", but none was found");
+                "modifies preceding \"content\", but none was found");
         SCReturnInt(-1);
     }
 
@@ -111,7 +111,7 @@ static int DetectHttpMethodSetup(DetectEngineCtx *de_ctx, Signature *s, char *st
                                                DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_PMATCH]);
     if (sm == NULL) {
         SCLogError(SC_ERR_HTTP_METHOD_NEEDS_PRECEEDING_CONTENT, "http_method "
-                "modifies preceeding \"content\", but none was found");
+                "modifies preceding \"content\", but none was found");
         SCReturnInt(-1);
     }
 
@@ -152,7 +152,7 @@ static int DetectHttpMethodSetup(DetectEngineCtx *de_ctx, Signature *s, char *st
                                         s->sm_lists_tail[DETECT_SM_LIST_HMDMATCH]);
         if (pm == NULL) {
             SCLogError(SC_ERR_HTTP_METHOD_RELATIVE_MISSING, "http_method with "
-                    "a distance or within requires preceeding http_method "
+                    "a distance or within requires preceding http_method "
                     "content, but none was found");
             goto error;
         }

diff --git a/src/detect-nocase.c b/src/detect-nocase.c
index 45c0f5cbfe14958a8111f5bae1c1fd529897fbdc..38b17006142474a9e3d5bc49c64dec173ee9ed04 100644 (file)
--- a/src/detect-nocase.c
+++ b/src/detect-nocase.c
@@ -88,7 +88,7 @@ static int DetectNocaseSetup (DetectEngineCtx *de_ctx, Signature *s, char *nulls
             DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HCDMATCH],
             DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HUADMATCH]);
     if (pm == NULL) {
-        SCLogError(SC_ERR_NOCASE_MISSING_PATTERN, "\"nocase\" needs a preceeding "
+        SCLogError(SC_ERR_NOCASE_MISSING_PATTERN, "\"nocase\" needs a preceding "
                    "content, uricontent, http_client_body, http_server_body, "
                    "http_header, http_method, http_uri, http_cookie, "
                    "http_raw_uri, http_stat_msg, http_stat_code or http_user_agent "
@@ -115,7 +115,7 @@ static int DetectNocaseSetup (DetectEngineCtx *de_ctx, Signature *s, char *nulls
             break;
             /* should never happen */
         default:
-            SCLogError(SC_ERR_NOCASE_MISSING_PATTERN, "\"nocase\" needs a preceeding "
+            SCLogError(SC_ERR_NOCASE_MISSING_PATTERN, "\"nocase\" needs a preceding "
                     "content, uricontent, http_client_body, http_server_body, "
                     "http_header, http_method, http_uri, http_cookie or "
                     "http_raw_uri option");

diff --git a/src/detect-offset.c b/src/detect-offset.c
index dc2b65f3357621ac681fd91bd63fd8330bb768f0..d331b0a57957b27e719174914a3de66092c89620 100644 (file)
--- a/src/detect-offset.c
+++ b/src/detect-offset.c
@@ -74,7 +74,7 @@ int DetectOffsetSetup (DetectEngineCtx *de_ctx, Signature *s, char *offsetstr)
                     DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_PMATCH]);
             if (pm == NULL) {
                 SCLogError(SC_ERR_OFFSET_MISSING_CONTENT, "offset needs "
-                           "preceeding content option for dcerpc sig");
+                           "preceding content option for dcerpc sig");
                 if (dubbed)
                     SCFree(str);
                 return -1;
@@ -98,7 +98,7 @@ int DetectOffsetSetup (DetectEngineCtx *de_ctx, Signature *s, char *offsetstr)
                     DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HUADMATCH]);
             if (pm == NULL) {
                 SCLogError(SC_ERR_OFFSET_MISSING_CONTENT, "offset needs "
-                           "preceeding content or uricontent option, http_client_body, "
+                           "preceding content or uricontent option, http_client_body, "
                            "http_header, http_raw_header, http_method, "
                            "http_cookie, http_raw_uri, http_stat_msg, "
                            "http_stat_code or http_user_agent option");
@@ -176,7 +176,7 @@ int DetectOffsetSetup (DetectEngineCtx *de_ctx, Signature *s, char *offsetstr)
             break;
 
         default:
-            SCLogError(SC_ERR_OFFSET_MISSING_CONTENT, "offset needs a preceeding"
+            SCLogError(SC_ERR_OFFSET_MISSING_CONTENT, "offset needs a preceding"
                     " content keyword");
             goto error;
     }

diff --git a/src/detect-parse.c b/src/detect-parse.c
index 0165fcf39c42d15758f287737d557eb4cbba4e08..19ac780a9dc3d3bceb7b41417ab4eb7f5364c3b3 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -1068,7 +1068,7 @@ static int SigValidate(Signature *s) {
                                                               DETECT_BYTEJUMP, sm->prev);
                     if (pm == NULL) {
                         SCLogError(SC_ERR_DISTANCE_MISSING_CONTENT, "within needs two "
-                                   "preceeding content or uricontent options");
+                                   "preceding content or uricontent options");
                         SCReturnInt(0);
                     } else {
                         break;

diff --git a/src/detect-rawbytes.c b/src/detect-rawbytes.c
index 4f891d7270a8ba26460d3d76e6239f940c12af9f..2695c147b56dfbbcb8ab5c36b806b43a4a6af721 100644 (file)
--- a/src/detect-rawbytes.c
+++ b/src/detect-rawbytes.c
@@ -67,7 +67,7 @@ static int DetectRawbytesSetup (DetectEngineCtx *de_ctx, Signature *s, char *nul
     SigMatch *pm =  SigMatchGetLastSMFromLists(s, 2,
                                                DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_PMATCH]);
     if (pm == NULL) {
-        SCLogError(SC_ERR_RAWBYTES_MISSING_CONTENT, "\"rawbytes\" needs a preceeding content option");
+        SCLogError(SC_ERR_RAWBYTES_MISSING_CONTENT, "\"rawbytes\" needs a preceding content option");
         SCReturnInt(-1);
     }
 
@@ -83,7 +83,7 @@ static int DetectRawbytesSetup (DetectEngineCtx *de_ctx, Signature *s, char *nul
             break;
         }
         default:
-            SCLogError(SC_ERR_RAWBYTES_MISSING_CONTENT, "\"rawbytes\" needs a preceeding content option");
+            SCLogError(SC_ERR_RAWBYTES_MISSING_CONTENT, "\"rawbytes\" needs a preceding content option");
             SCReturnInt(-1);
     }
 

diff --git a/src/detect-replace.c b/src/detect-replace.c
index 7ab4d048e2c0c60c76044931e187707b223c2437..aa8fa06542b2b61d39caa724caf83fefc15a8ab9 100644 (file)
--- a/src/detect-replace.c
+++ b/src/detect-replace.c
@@ -103,7 +103,7 @@ int DetectReplaceSetup(DetectEngineCtx *de_ctx, Signature *s, char *replacestr)
             DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_PMATCH]);
     if (pm == NULL) {
         SCLogError(SC_ERR_WITHIN_MISSING_CONTENT, "replace needs"
-                "preceeding content option for raw sig");
+                "preceding content option for raw sig");
         SCFree(str);
         return -1;
     }

diff --git a/src/detect-within.c b/src/detect-within.c
index 481afe31898df9bb843f302b34660272f9652614..94a391f087e321aea5ac690d165c7069edbb0618 100644 (file)
--- a/src/detect-within.c
+++ b/src/detect-within.c
@@ -178,7 +178,7 @@ static int DetectWithinSetup (DetectEngineCtx *de_ctx, Signature *s, char *withi
                 DETECT_CONTENT, s->sm_lists_tail[DETECT_SM_LIST_HUADMATCH]);
         if (pm == NULL) {
             SCLogError(SC_ERR_WITHIN_MISSING_CONTENT, "\"within\" requires "
-                       "preceeding content, uricontent, http_client_body, "
+                       "preceding content, uricontent, http_client_body, "
                        "http_server_body, http_header, http_raw_header, "
                        "http_method, http_cookie, http_raw_uri, "
                        "http_stat_msg, http_stat_code or http_user_agent "
@@ -307,7 +307,7 @@ static int DetectWithinSetup (DetectEngineCtx *de_ctx, Signature *s, char *withi
 
         default:
             SCLogError(SC_ERR_WITHIN_MISSING_CONTENT, "within needs two "
-                       "preceeding content or uricontent options");
+                       "preceding content or uricontent options");
             goto error;
     }
 

diff --git a/src/detect.c b/src/detect.c
index f577b80514632ad1f6af768dbd08545835e5e0ac..2971771f6297eb53e192a5e46d6364791306c851 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -698,7 +698,7 @@ int SigLoadSignatures(DetectEngineCtx *de_ctx, char *sig_file, int sig_file_excl
         }
     } else {
         /* we report the total of files and rules successfully loaded and failed */
-        SCLogInfo("%" PRId32 " rule files processed. %" PRId32 " rules succesfully loaded, %" PRId32 " rules failed", cntf, cnt, sigtotal-cnt);
+        SCLogInfo("%" PRId32 " rule files processed. %" PRId32 " rules successfully loaded, %" PRId32 " rules failed", cntf, cnt, sigtotal-cnt);
     }
 
     if (ret < 0 && de_ctx->failure_fatal) {

diff --git a/src/runmode-af-packet.c b/src/runmode-af-packet.c
index d599033c1a0f8d502c087c13967887fa1b54fb17..18f1b9b3059e5430e5aa9cdb576818de30b01a2a 100644 (file)
--- a/src/runmode-af-packet.c
+++ b/src/runmode-af-packet.c
@@ -191,7 +191,7 @@ void *ParseAFPConfig(const char *iface)
                 aconf->iface);
         ConfGetChildValueBool(if_root, "defrag", (int *)&defrag);
         if (defrag) {
-            SCLogInfo("Using defrag kernel functionnality for AF_PACKET (iface %s)",
+            SCLogInfo("Using defrag kernel functionality for AF_PACKET (iface %s)",
                     aconf->iface);
             defrag = PACKET_FANOUT_FLAG_DEFRAG;
         }

diff --git a/src/util-debug.c b/src/util-debug.c
index b3a7342cec40147879ffbc19880ff04196121b7b..4297bf9d04fc95e6a7aa20916e5c6113ea007c56 100644 (file)
--- a/src/util-debug.c
+++ b/src/util-debug.c
@@ -1035,7 +1035,7 @@ SCLogOPIfaceCtx *SCLogInitOPIfaceCtx(const char *iface_name,
     if (log_level < SC_LOG_NONE || log_level > SC_LOG_DEBUG) {
 #ifndef UNITTESTS
         printf("Warning: Supplied log_level_override for op_interface \"%s\" "
-               "is invalid.  Defaulting to not specifing an override\n",
+               "is invalid.  Defaulting to not specifying an override\n",
                iface_name);
 #endif
         log_level = SC_LOG_NOTSET;

diff --git a/src/util-runmodes.c b/src/util-runmodes.c
index ea3d70aca9284beedfc4e3eb9bdd2c448b3a4f77..6e37ad8603855ce038a78cc1f964fbaefef261aa 100644 (file)
--- a/src/util-runmodes.c
+++ b/src/util-runmodes.c
@@ -74,7 +74,7 @@ int RunModeSetLiveCaptureAuto(DetectEngineCtx *de_ctx,
 
         if (ModThreadsCount(aconf) > 1) {
             SCLogWarning(SC_ERR_UNIMPLEMENTED, "'Auto' running mode does not honor 'threads'"
-                         " variable (set on '%s'). Please use an other mode as"
+                         " variable (set on '%s'). Please use another mode as"
                          " 'autofp' or 'worker'",
                          live_dev);
         }
@@ -125,7 +125,7 @@ int RunModeSetLiveCaptureAuto(DetectEngineCtx *de_ctx,
 
             if (ModThreadsCount(aconf) > 1) {
                 SCLogWarning(SC_ERR_UNIMPLEMENTED, "'Auto' running mode does not honor 'threads'"
-                         " variable (set on '%s'). Please use an other mode as"
+                         " variable (set on '%s'). Please use another mode as"
                          " 'autofp' or 'worker'",
                          live_dev);
             }

diff --git a/suricata.yaml.in b/suricata.yaml.in
index a3bbabf6636fb06c997708eb38580b76605dfdcc..7ffb3ae9c91a27082f9c6ac985bc2f1b7b81b1b8 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -84,7 +84,7 @@ outputs:
 
   # a line based log to used with pcap file study.
   # this module is dedicated to offline pcap parsing (empty output
-  # if used with an other kind of input). It can interoperate with
+  # if used with another kind of input). It can interoperate with
   # pcap parser like wireshark via the suriwire plugin.
   - pcap-info:
       enabled: no