aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-11-25 20:38:52 +0100
committerMicael Karlberg <[email protected]>2011-11-25 20:38:52 +0100
commit9474024afb6a6b33e3ed433a7a2fab6f7901cf71 (patch)
tree86c8fb77a86e4f327d5c354704f23aaa2580313a /lib/snmp
parente672f34bab62d06fd28b7d68784ddf9af27e3531 (diff)
parent091a22dda4448dfbc03f9727bd066e19071b59ba (diff)
downloadotp-9474024afb6a6b33e3ed433a7a2fab6f7901cf71.tar.gz
otp-9474024afb6a6b33e3ed433a7a2fab6f7901cf71.tar.bz2
otp-9474024afb6a6b33e3ed433a7a2fab6f7901cf71.zip
Merge branch 'bmk/snmp/compiler/fix_short_warning_option/r14/OTP-9718' into bmk/snmp/snmp4213_integration
Diffstat (limited to 'lib/snmp')
-rw-r--r--lib/snmp/doc/src/notes.xml23
-rw-r--r--lib/snmp/src/compile/snmpc.src4
2 files changed, 25 insertions, 2 deletions
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 9e685174b7..022c0c81a9 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -74,13 +74,36 @@
<p>Own Id: OTP-9747</p>
</item>
+ <item>
+ <p>[compiler] Fix the <c>--warnings/--W</c> option parsing in the
+ <seealso marker="snmpc(command)#option_warnings">snmpc</seealso>
+ wrapper (e)script.
+ The short warning option was incorrectly <c>--w</c>, instead
+ of as documented <c>--W</c>. This has now been corrected. </p>
+ <p>*** POTENTIAL INCOMPATIBILITY ***</p>
+ <p>Tuncer Ayaz</p>
+ <p>Own Id: OTP-9718</p>
+ </item>
+
</list>
</section>
<section>
<title>Incompatibilities</title>
+<!--
<p>-</p>
+-->
+
+ <list type="bulleted">
+ <item>
+ <p>[compiler] The short warning option has been changed from
+ <c>--w</c> to <c>--W</c> to comply with the documentation. </p>
+ <p>Tuncer Ayaz</p>
+ <p>Own Id: OTP-9718</p>
+ </item>
+
+ </list>
</section>
</section> <!-- 4.21.3 -->
diff --git a/lib/snmp/src/compile/snmpc.src b/lib/snmp/src/compile/snmpc.src
index 7edd2111a5..9d1af42764 100644
--- a/lib/snmp/src/compile/snmpc.src
+++ b/lib/snmp/src/compile/snmpc.src
@@ -74,7 +74,7 @@
%% --rrnac
%% --version
%% --verbosity V
-%% --warnings
+%% --warnings | --W
%% --Werror | --wae | --warnings_as_errors
main(Args) when is_list(Args) ->
case (catch process_args(Args)) of
@@ -237,7 +237,7 @@ 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(["--W"|Args], State) ->
process_args(Args, State#state{warnings = true});
process_args(["--warnings"|Args], State) ->
process_args(Args, State#state{warnings = true});