diff options
| author | Hans Bolinder <[email protected]> | 2018-03-13 10:26:02 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-03-13 10:26:02 +0100 |
| commit | 54e20b0df9e643f48bcc4bcb8d58bdc97335b42b (patch) | |
| tree | e4bbb6795745163e7a0ca0277793dc1e4258710d /lib/os_mon | |
| parent | 3fa85a8e858e1c8300967e0eda347697c0940188 (diff) | |
| parent | b4d1aa182b211083c2982a700aa3e35eddecb6fc (diff) | |
| download | otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.tar.gz otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.tar.bz2 otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.zip | |
Merge branch 'hasse/dialyzer/extra-range/OTP-14970'
* hasse/dialyzer/extra-range/OTP-14970:
ssl: Correct some specs
os_mon: Correct a spec
Fix broken spec in beam_asm
Dialyzer should not throw away spec information because of overspec
Diffstat (limited to 'lib/os_mon')
| -rw-r--r-- | lib/os_mon/src/disksup.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl index aeec335ba7..5118d807e1 100644 --- a/lib/os_mon/src/disksup.erl +++ b/lib/os_mon/src/disksup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -357,7 +357,7 @@ parse_df_take_word_percent(Input) -> %% and capacity), skip % sign, (optionally for susv3 can also skip IUsed, IFree %% and ICap% fields) then take remaining characters as the mount path -spec parse_df(string(), posix | susv3) -> - {error, parse_df} | {ok, {integer(), integer(), integer()}, string()}. + {error, parse_df} | {ok, {integer(), integer(), list()}, string()}. parse_df(Input0, Flavor) -> %% Format of Posix/Linux df output looks like Header + Lines %% Filesystem 1024-blocks Used Available Capacity Mounted on |