From: Victor Julien <victor@inliniac.net>
Date: Tue, 28 Feb 2012 09:29:13 +0000 (+0100)
Subject: Add line number to warning about mangled yaml parameters. Limit number of warnings... 
X-Git-Tag: suricata-1.3beta1~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b2d94a841d90641b6e086638c68cc383117f0f0;p=thirdparty%2Fsuricata.git

Add line number to warning about mangled yaml parameters. Limit number of warnings to 10.
---

diff --git a/src/conf-yaml-loader.c b/src/conf-yaml-loader.c
index 33c2569686..eb76286505 100644
--- a/src/conf-yaml-loader.c
+++ b/src/conf-yaml-loader.c
@@ -37,6 +37,9 @@
  * work most of the time. */
 #define DEFAULT_NAME_LEN 16
 
+#define MANGLE_ERRORS_MAX 10
+static int mangle_errors = 0;
+
 /* Configuration processing states. */
 enum conf_state {
     CONF_KEY = 0,
@@ -139,9 +142,15 @@ ConfYamlParse(yaml_parser_t *parser, ConfNode *parent, int inseq)
                                    ((strcmp(parent->name, "address-groups") == 0) ||
                                     (strcmp(parent->name, "port-groups") == 0)))) {
                                 Mangle(node->name);
-                                SCLogWarning(SC_WARN_DEPRECATED,
-                                    "%s is deprecated. Please use %s",
-                                    value, node->name);
+                                if (mangle_errors < MANGLE_ERRORS_MAX) {
+                                    SCLogWarning(SC_WARN_DEPRECATED,
+                                            "%s is deprecated. Please use %s on line %"PRIuMAX".",
+                                            value, node->name, (uintmax_t)parser->mark.line+1);
+                                    mangle_errors++;
+                                    if (mangle_errors >= MANGLE_ERRORS_MAX)
+                                        SCLogWarning(SC_WARN_DEPRECATED, "not showing more "
+                                                "parameter name warnings.");
+                                }
                             }
                         }
                         TAILQ_INSERT_TAIL(&parent->head, node, next);