Merge branch 'bmk/snmp/compiler/wrong_variable_name/OTP-9447' into bmk/snmp/snmp4211_integration

6 files changed, 106 insertions, 34 deletions

diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 4178192120..4272e02b45 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -44,6 +44,57 @@
 -->
       <list type="bulleted">
         <item>
+          <p>[compiler] Used wrong variable name (for 
+	  warnings-as-errors variable), which caused the 
+	  compiler to crash when using the snmpc (e)script. </p>
+	  <p>Also added the option 
+	  <seealso marker="snmpc(command)#option_werror">--Werror</seealso>
+	  for the SNMP MIB compiler (escript) frontend (to mimic 
+	  <seealso marker="erts:erlc">erlc</seealso>), 
+	  which specifies whether warnings should be treated as errors. </p>
+          <p>Own Id: OTP-9447</p>
+        </item>
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p> 
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>The snmp config tool could not handle (manager) audit trail config 
+	  because the option seqno was not handled. </p>
+	  <p>Own Id: OTP-9354</p>
+	</item>
+
+      </list>
+-->
+    </section>
+
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+    </section>
+
+  </section> <!-- 4.21.1 -->
+
+
+  <section>
+    <title>SNMP Development Toolkit 4.21</title>
+    <p>Version 4.21 supports code replacement in runtime from/to
+      version 4.20.1, 4.20 and 4.19. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+      <list type="bulleted">
+        <item>
           <p>[manager] There was no way to specify transport domain. 
 	  The transport domains was assumed to be IPv4 (transportDomainUdpIpv4).
 	  This has now been changed so that it can also be IPv6 
diff --git a/lib/snmp/doc/src/snmpc_cmd.xml b/lib/snmp/doc/src/snmpc_cmd.xml
index 72116f8981..971f8a3cff 100644
--- a/lib/snmp/doc/src/snmpc_cmd.xml
+++ b/lib/snmp/doc/src/snmpc_cmd.xml
@@ -79,16 +79,18 @@
         <p>Print debug info. </p>
 	<p><c>verbosity</c> = <c>trace</c> | <c>debug</c> | <c>log</c> | <c>info</c> | <c>silence</c></p>
 	<p>Defaults to <c>silence</c>.</p>
+	<marker id="option_w"></marker>
 	<marker id="option_warnings"></marker>
       </item>
 
-      <tag>--warnings</tag>
+      <tag>--warnings | --W</tag>
       <item>
         <p>Print warning messages. </p>
 	<marker id="option_wae"></marker>
+	<marker id="option_werror"></marker>
       </item>
 
-      <tag>--wae</tag>
+      <tag>--wae | --Werror</tag>
       <item>
         <p>Warnings as errors. 
 	Indicates that warnings shall be treated as errors. </p>
@@ -211,7 +213,7 @@
 
   <section>
     <title>SEE ALSO</title>
-    <p><seealso marker="erlc">erlc(1)</seealso>,
+    <p><seealso marker="erts:erlc">erlc(1)</seealso>,
     <seealso marker="compiler:compile">compile(3)</seealso>,
     <seealso marker="snmp:snmpc">snmpc(3)</seealso></p>
   </section>
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 8e1855b4df..22817bc21d 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,10 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.21", 
+   [
+   ]
+  }, 
   {"4.20.1", 
    [
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
@@ -109,6 +113,10 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.21", 
+   [
+   ]
+  }, 
   {"4.20.1", 
    [
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src
index 4e91ae9a03..f993335b89 100644
--- a/lib/snmp/src/compile/snmpc.src
+++ b/lib/snmp/src/compile/snmpc.src
@@ -46,7 +46,7 @@
 	 agent_capabilities = false,
 	 module,
 	 no_defaults        = false,
-	 relaxed_row_name_assigne_check = false,
+	 relaxed_row_name_assign_check = false,
 	 %% The default verbosity (silence) will be filled in 
 	 %% during argument processing.
 	 verbosity, 
@@ -75,7 +75,7 @@
 %% --version
 %% --verbosity V
 %% --warnings
-%% --wae
+%% --Werror | --wae | --warnings_as_errors
 main(Args) when is_list(Args) ->
     case (catch process_args(Args)) of
 	ok ->
@@ -154,7 +154,7 @@ mk_mib_options(#state{outdir             = OutDir,
 		      agent_capabilities = AC,
 		      module             = Mod,
 		      no_defaults        = ND,
-		      relaxed_row_name_assigne_check = RRNAC,
+		      relaxed_row_name_assign_check = RRNAC,
 		      %% The default verbosity (silence) will be filled in 
 		      %% during argument processing.
 		      verbosity          = V, 
@@ -182,7 +182,7 @@ mk_mib_options(#state{outdir             = OutDir,
 	maybe_option(MI,    module_identity) ++ 
 	maybe_option(MC,    module_compliance) ++ 
 	maybe_option(AC,    agent_capabilities) ++ 
-	maybe_option(WE,    warnings_as_errors).
+	maybe_option(WAE,   warnings_as_errors).
 
 maybe_option(true, Opt) -> [Opt];
 maybe_option(_,    _)   -> [].
@@ -234,6 +234,8 @@ process_args(["--verbosity", Verbosity0|Args], #state{verbosity = V} = State)
 process_args(["--verbosity"|_Args], #state{verbosity = V}) 
   when (V =/= undefined) ->
     e(lists:flatten(io_lib:format("Verbosity already set to ~w", [V])));
+process_args(["--w"|Args], State) ->
+    process_args(Args, State#state{warnings = true});
 process_args(["--warnings"|Args], State) ->
     process_args(Args, State#state{warnings = true});
 process_args(["--o", Dir|Args], State) ->
@@ -295,9 +297,13 @@ process_args(["--mod"|_Args], #state{module = M})
 process_args(["--nd"|Args], State) ->
     process_args(Args, State#state{no_defaults = true});
 process_args(["--rrnac"|Args], State) ->
-    process_args(Args, State#state{relaxed_row_name_assigne_check = true});
+    process_args(Args, State#state{relaxed_row_name_assign_check = true});
+process_args(["--Werror"|Args], State) ->
+    process_args(Args, State#state{warnings_as_errors = true});
 process_args(["--wae"|Args], State) ->
     process_args(Args, State#state{warnings_as_errors = true});
+process_args(["--warnings_as_errors"|Args], State) ->
+    process_args(Args, State#state{warnings_as_errors = true});
 process_args([MIB], State) ->
     Ext = filename:extension(MIB),
     if 
@@ -332,7 +338,7 @@ usage() ->
 	      "~n   --verbosity <verbosity>  - Print debug info."
 	      "~n                              verbosity = trace | debug | log | info | silence"
 	      "~n                              Defaults to silence."
-	      "~n   --warnings               - Print warning messages."
+	      "~n   --warnings | --W         - Print warning messages."
 	      "~n   --o <output dir>         - The output dir."
 	      "~n                              Defaults to current working dir."
 	      "~n   --i <include dir>        - Add this dir to the list of dirs that will be"
@@ -340,16 +346,19 @@ usage() ->
 	      "~n                              The current workin dir will always be included. "
 	      "~n   --il <include_lib dir>   - Add this dir to the list of dirs that will be"
 	      "~n                              searched for imported (compiled) MIB files."
-	      "~n                              It assumes that the first element in the dir name"
-	      "~n                              correspond to an OTP application. For example snmp/mibs/"
-	      "~n                              The current workin dir and the <snmp-home>/priv/mibs "
+	      "~n                              It assumes that the first element in the dir "
+	      "~n                              name correspond to an OTP application. "
+	      "~n                              For example snmp/mibs/ "
+	      "~n                              The current workin dir and the "
+	      "~n                              <snmp-home>/priv/mibs "
 	      "~n                              are always listed last the includ path. "
 	      "~n   --db <DB>                - Database to used for the default instrumentation."
 	      "~n                              Defaults to volatile."
-	      "~n   --sgc                    - This option (skip group check), if present, disables "
-	      "~n                              the \"group check\" of the mib compiler. "
-	      "~n                              That is, should the OBJECT-GROUP and the NOTIFICATION-GROUP "
-	      "~n                              macro(s) be checked for correctness or not. "
+	      "~n   --sgc                    - This option (skip group check), if present, "
+	      "~n                              disables the \"group check\" of the mib compiler. "
+	      "~n                              That is, should the OBJECT-GROUP and the "
+	      "~n                              NOTIFICATION-GROUP macro(s) be checked for "
+	      "~n                              correctness or not. "
 	      "~n                              By default the check is done. "
 	      "~n   --dep                    - Keep deprecated definition(s)."
 	      "~n                              If not specified the compiler will ignore"
@@ -360,25 +369,27 @@ usage() ->
 	      "~n   --mi                     - The MODULE-IDENTITY field will be included."
 	      "~n   --mc                     - The MODULE-COMPLIANCE field will be included."
 	      "~n   --ac                     - The AGENT-CAPABILITIES field will be included."
-	      "~n   --mod <module>           - The module which implements all the instrumentation"
-	      "~n                              functions. "
+	      "~n   --mod <module>           - The module which implements all the "
+	      "~n                              instrumentation functions. "
 	      "~n                              The name of all instrumentation functions must"
 	      "~n                              be the same as the corresponding managed object"
 	      "~n                              it implements."
-	      "~n   --nd                     - The default instrumentation functions will *not* be used"
-	      "~n                              if a managed object have no instrumentation function. "
-	      "~n                              Instead this will be reported as an error, and the "
-	      "~n                              compilation aborts. "
-	      "~n   --rrnac                  - This option, if present, specifies that the row name "
-	      "~n                              assign check shall not be done strictly according to"
-	      "~n                              the SMI (which allows only the value 1). "
-	      "~n                              With this option, all values greater than zero is allowed"
-	      "~n                              (>= 1). This means that the error will be converted to "
+	      "~n   --nd                     - The default instrumentation functions will *not* "
+	      "~n                              be used if a managed object have no "
+	      "~n                              instrumentation function. Instead this will be "
+	      "~n                              reported as an error, and the compilation aborts. "
+	      "~n   --rrnac                  - This option, if present, specifies that the row "
+	      "~n                              name assign check shall not be done strictly "
+	      "~n                              according to the SMI (which allows only the "
+	      "~n                              value 1). With this option, all values greater "
+	      "~n                              than zero is allowed (>= 1). "
+	      "~n                              This means that the error will be converted to "
 	      "~n                              a warning. "
-	      "~n                              By default it is not included, but if this option is "
-	      "~n                              present it will be. "
-	      "~n   --wae                    - Warnings as errors. "
-              "~n                              Indicates that warnings shall be treated as errors. "
+	      "~n                              By default it is not included, but if this "
+	      "~n                              option is present it will be. "
+	      "~n   --wae | --Werror         - Warnings as errors. "
+              "~n                              Indicates that warnings shall be treated as "
+              "~n                              errors. "
 	      "~n   "
 	      "~n", []),
     halt(1).
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl
index 4f71c47bfa..a0a35e91c4 100644
--- a/lib/snmp/src/compile/snmpc_lib.erl
+++ b/lib/snmp/src/compile/snmpc_lib.erl
@@ -1754,12 +1754,12 @@ error(FormatStr, Data, Line) when is_list(FormatStr) ->
     exit(error).
 
 print_error(FormatStr, Data) when is_list(FormatStr) ->
-    ok = io:format("~s: Error: " ++ FormatStr,[get(filename)|Data]),
+    ok = io:format("~s: " ++ FormatStr,[get(filename)|Data]),
     put(errors,yes),
     io:format("~n").
     
 print_error(FormatStr, Data,Line) when is_list(FormatStr) ->
-    ok = io:format("~s: ~w: Error: " ++ FormatStr,[get(filename), Line |Data]),
+    ok = io:format("~s: ~w: " ++ FormatStr,[get(filename), Line |Data]),
     put(errors,yes),
     io:format("~n").
 
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 08251ab9ea..c95e0a22d1 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -17,6 +17,6 @@
 #
 # %CopyrightEnd%
 
-SNMP_VSN = 4.21
+SNMP_VSN = 4.21.1
 PRE_VSN  =
 APP_VSN  = "snmp-$(SNMP_VSN)$(PRE_VSN)"