detect: constify rule file and lines in parsing and analyzer

diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 7486b9dd804810bca3405add63a088e9af952c9f..b17e8929ecd2f3742cb0f9ac0d0d30ffa767bb8d 100644 (file)
--- a/src/detect-engine-analyzer.c
+++ b/src/detect-engine-analyzer.c
@@ -166,7 +166,7 @@ static void FpPatternStatsAdd(FpPatternStats *fp, int list, uint16_t patlen)
     f->tot += patlen;
 }
 
-void EngineAnalysisFP(const DetectEngineCtx *de_ctx, const Signature *s, char *line)
+void EngineAnalysisFP(const DetectEngineCtx *de_ctx, const Signature *s, const char *line)
 {
     int fast_pattern_set = 0;
     int fast_pattern_only_set = 0;
@@ -620,7 +620,8 @@ static void EngineAnalysisRulesPrintFP(const DetectEngineCtx *de_ctx, const Sign
     fprintf(ea_ctx->rule_engine_analysis_fp, "buffer.\n");
 }
 
-void EngineAnalysisRulesFailure(const DetectEngineCtx *de_ctx, char *line, char *file, int lineno)
+void EngineAnalysisRulesFailure(
+        const DetectEngineCtx *de_ctx, const char *line, const char *file, int lineno)
 {
     fprintf(de_ctx->ea->fp_engine_analysis_fp, "== Sid: UNKNOWN ==\n");
     fprintf(de_ctx->ea->fp_engine_analysis_fp, "%s\n", line);

diff --git a/src/detect-engine-analyzer.h b/src/detect-engine-analyzer.h
index dda71f3384687bca8954255b43d7df6fb3cb4cbc..7419d318567e96b59610e7ef8e8ac474e1d36770 100644 (file)
--- a/src/detect-engine-analyzer.h
+++ b/src/detect-engine-analyzer.h
@@ -31,11 +31,11 @@ struct DetectEngineCtx_;
 void SetupEngineAnalysis(struct DetectEngineCtx_ *de_ctx, bool *, bool *);
 void CleanupEngineAnalysis(struct DetectEngineCtx_ *de_ctx);
 
-void EngineAnalysisFP(const struct DetectEngineCtx_ *de_ctx, const Signature *s, char *line);
+void EngineAnalysisFP(const struct DetectEngineCtx_ *de_ctx, const Signature *s, const char *line);
 void EngineAnalysisRules(
         const struct DetectEngineCtx_ *de_ctx, const Signature *s, const char *line);
 void EngineAnalysisRulesFailure(
-        const struct DetectEngineCtx_ *de_ctx, char *line, char *file, int lineno);
+        const struct DetectEngineCtx_ *de_ctx, const char *line, const char *file, int lineno);
 
 void EngineAnalysisRules2(const struct DetectEngineCtx_ *de_ctx, const Signature *s);
 

diff --git a/src/detect-engine-loader.c b/src/detect-engine-loader.c
index 30e931165cbc4bf2bc32da910f5f72e41fdaea1e..05cd6d016d3d703d83d5ea0ab5c4d8d0312ce982 100644 (file)
--- a/src/detect-engine-loader.c
+++ b/src/detect-engine-loader.c
@@ -110,8 +110,8 @@ char *DetectLoadCompleteSigPath(const DetectEngineCtx *de_ctx, const char *sig_f
  *  \param badsigs_tot Will store number of invalid signatures in the file
  *  \retval 0 on success, -1 on error
  */
-static int DetectLoadSigFile(
-        DetectEngineCtx *de_ctx, char *sig_file, int *goodsigs, int *badsigs, int *skippedsigs)
+static int DetectLoadSigFile(DetectEngineCtx *de_ctx, const char *sig_file, int *goodsigs,
+        int *badsigs, int *skippedsigs)
 {
     Signature *sig = NULL;
     int good = 0, bad = 0, skipped = 0;

diff --git a/src/detect.h b/src/detect.h
index e48e9e88bb62744d9d700350f4109919fb99d6fc..cea44e7a1b68e486f8a55873473169a43d0af06a 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -947,7 +947,7 @@ typedef struct DetectEngineCtx_ {
 
     /** Store rule file and line so that parsers can use them in errors. */
     int rule_line;
-    char *rule_file;
+    const char *rule_file;
     const char *sigerror;
     bool sigerror_silent;
     bool sigerror_ok;