diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:33:23 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:33:23 +0200 |
| commit | fcbb937b9e34e97529aa28e994c05c2d03dc89cd (patch) | |
| tree | dbe90a51c8c7e9134a88cbb0989746c1c5a69b1d /lib | |
| parent | 6c84fcf954bfb9f14121e8e5a6f9e7611be63d93 (diff) | |
| parent | 2d2aa9acab933d63a3661b120a26bd5867327c05 (diff) | |
| download | otp-fcbb937b9e34e97529aa28e994c05c2d03dc89cd.tar.gz otp-fcbb937b9e34e97529aa28e994c05c2d03dc89cd.tar.bz2 otp-fcbb937b9e34e97529aa28e994c05c2d03dc89cd.zip | |
Merge branch 'ia/inets-dialyzer' into maint
* ia/inets-dialyzer:
inets: Dialyzer spec fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/src/http_server/httpd_log.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/inets/src/http_server/httpd_log.erl b/lib/inets/src/http_server/httpd_log.erl index 60ab326a20..a34435e0e8 100644 --- a/lib/inets/src/http_server/httpd_log.erl +++ b/lib/inets/src/http_server/httpd_log.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2011. All Rights Reserved. +%% Copyright Ericsson AB 2008-2012. 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 @@ -36,8 +36,8 @@ AuthUser :: string(), Date :: string(), StatusCode :: pos_integer(), - Size :: pos_integer() | string()) -> - {Log :: atom() | pid(), Entry :: string()}. + Size :: 0 | pos_integer() | string()) -> + {Log :: atom() | pid(), Entry :: string()} | term() . access_entry(Log, NoLog, Info, RFC931, AuthUser, Date, StatusCode, SizeStr) when is_list(SizeStr) -> @@ -69,7 +69,7 @@ access_entry(Log, NoLog, Info :: #mod{}, Date :: string(), Reason :: term()) -> - {Log :: atom() | pid(), Entry :: string()}. + {Log :: atom() | pid(), Entry :: string()} | term(). error_entry(Log, NoLog, #mod{config_db = ConfigDB, @@ -87,7 +87,7 @@ error_entry(Log, NoLog, ConfigDB :: term(), Date :: string(), ErrroStr :: string()) -> - {Log :: atom() | pid(), Entry :: string()}. + {Log :: atom() | pid(), Entry :: string()} | term(). error_report_entry(Log, NoLog, ConfigDb, Date, ErrorStr) -> MakeEntry = fun() -> io_lib:format("[~s], ~s~n", [Date, ErrorStr]) end, @@ -99,7 +99,7 @@ error_report_entry(Log, NoLog, ConfigDb, Date, ErrorStr) -> ConfigDB :: term(), Date :: string(), Reason :: term()) -> - {Log :: atom() | pid(), Entry :: string()}. + {Log :: atom() | pid(), Entry :: string()} | term(). security_entry(Log, NoLog, #mod{config_db = ConfigDB}, Date, Reason) -> MakeEntry = fun() -> io_lib:format("[~s] ~s~n", [Date, Reason]) end, |