diff options
author | Erlang/OTP <[email protected]> | 2010-02-17 11:13:42 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-02-17 11:13:42 +0000 |
commit | 40b76c2e854c9771f8699fd143299ad2d6de4603 (patch) | |
tree | 0785b7428656150c1ee6d19345dee941355ab4f6 /lib/sasl/src | |
parent | 4a33e37e8c1b4f60a6890dccae438cd8fbbb05ef (diff) | |
parent | a8bf1fe3b9f5f69354403231a3c47489d9015977 (diff) | |
download | otp-40b76c2e854c9771f8699fd143299ad2d6de4603.tar.gz otp-40b76c2e854c9771f8699fd143299ad2d6de4603.tar.bz2 otp-40b76c2e854c9771f8699fd143299ad2d6de4603.zip |
Merge branch 'ks/cleanups' into ccase/r13b04_dev
* ks/cleanups:
percept: Clean up as suggested by tidier
percept: Modernize types and specs
parsetools: Don't use 'try...of' when 'try' will do
parsetools: Use %% for comments at the beginning of a line
parsetools: Replace lists:keysearch/3 with lists:keyfind/3
parsetools: Modernize types and specs
parsetools: Replace TABs with spaces
runtime_tools: Modernize specs
sasl: Eliminate tuple used as fun
sasl: Add missing modules to app file
asn1: Clean up as suggested by tidier
os_mon: Modernize types and specs
wx: Clean up as suggested by tidier
OTP-8455 ks/cleanups
Diffstat (limited to 'lib/sasl/src')
-rw-r--r-- | lib/sasl/src/sasl.app.src | 12 | ||||
-rw-r--r-- | lib/sasl/src/sasl.erl | 14 |
2 files changed, 14 insertions, 12 deletions
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src index cfe4b81ab6..8c814cfaf5 100644 --- a/lib/sasl/src/sasl.app.src +++ b/lib/sasl/src/sasl.app.src @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 1996-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% {application, sasl, @@ -32,6 +32,8 @@ sasl_report, sasl_report_tty_h, sasl_report_file_h, + si, + si_sasl_supp, systools, systools_make, systools_rc, diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl index 979d80159e..d1babaffff 100644 --- a/lib/sasl/src/sasl.erl +++ b/lib/sasl/src/sasl.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 1996-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 1996-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% -module(sasl). @@ -126,13 +126,13 @@ type(_) -> all. add_error_logger_mf(undefined) -> ok; add_error_logger_mf({Dir, MaxB, MaxF}) -> error_logger:add_report_handler( - log_mf_h, log_mf_h:init(Dir, MaxB, MaxF, {sasl, pred})). + log_mf_h, log_mf_h:init(Dir, MaxB, MaxF, fun pred/1)). delete_error_logger_mf(undefined) -> ok; delete_error_logger_mf(_) -> error_logger:delete_report_handler(log_mf_h). -pred({_Type, GL, _Msg}) when node(GL) /= node() -> false; +pred({_Type, GL, _Msg}) when node(GL) =/= node() -> false; pred(_) -> true. %%%----------------------------------------------------------------- |