From 0df4c5838d7aea1762c2d9bb3b2a7ceab0ad52e4 Mon Sep 17 00:00:00 2001 From: pi-rho Date: Mon, 27 Aug 2012 19:13:50 -0500 Subject: [PATCH] spelling corrections documented in redmine bug#533 --- libhtp/htp/htp_util.c | 2 +- src/alert-pcapinfo.c | 2 +- src/detect-depth.c | 6 +++--- src/detect-distance.c | 6 +++--- src/detect-dsize.c | 2 +- src/detect-engine-siggroup.c | 6 +++--- src/detect-http-cookie.c | 2 +- src/detect-http-method.c | 6 +++--- src/detect-nocase.c | 4 ++-- src/detect-offset.c | 6 +++--- src/detect-parse.c | 2 +- src/detect-rawbytes.c | 4 ++-- src/detect-replace.c | 2 +- src/detect-within.c | 4 ++-- src/detect.c | 2 +- src/runmode-af-packet.c | 2 +- src/util-debug.c | 2 +- src/util-runmodes.c | 4 ++-- suricata.yaml.in | 2 +- 19 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libhtp/htp/htp_util.c b/libhtp/htp/htp_util.c index 09775a7000..8e2864ce50 100644 --- 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 8e5700338e..a953de8ce0 100644 --- a/src/alert-pcapinfo.c +++ b/src/alert-pcapinfo.c @@ -21,7 +21,7 @@ * \author Eric Leblond * * 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 85fadb69e8..a6c4b31c0d 100644 --- 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 fbcd969c43..75220670a4 100644 --- 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 3784e0a5a3..d8a1afcfe7 100644 --- 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 3c7ccad8a7..d42a6d69f7 100644 --- 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 227ea0910d..0d1b9d99a2 100644 --- 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 9815d931a4..c2968d9069 100644 --- 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 45c0f5cbfe..38b1700614 100644 --- 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 dc2b65f335..d331b0a579 100644 --- 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 0165fcf39c..19ac780a9d 100644 --- 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 4f891d7270..2695c147b5 100644 --- 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 7ab4d048e2..aa8fa06542 100644 --- 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 481afe3189..94a391f087 100644 --- 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 f577b80514..2971771f62 100644 --- 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 d599033c1a..18f1b9b305 100644 --- 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 b3a7342cec..4297bf9d04 100644 --- 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 ea3d70aca9..6e37ad8603 100644 --- 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 a3bbabf663..7ffb3ae9c9 100644 --- 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