diff options
| author | Hans Bolinder <[email protected]> | 2018-01-10 09:40:28 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-01-10 09:40:28 +0100 |
| commit | cfeea60dc32e545882047d0ab1d77566a83dcbd3 (patch) | |
| tree | c410244894f0cd9877421cde2757125e09a24849 /lib | |
| parent | af78b33b77f0bb4abff1a4f3144c2a8a5acb3d4e (diff) | |
| parent | 3c333686c80b84541e4971b9eb9c97a6eb57ecf9 (diff) | |
| download | otp-cfeea60dc32e545882047d0ab1d77566a83dcbd3.tar.gz otp-cfeea60dc32e545882047d0ab1d77566a83dcbd3.tar.bz2 otp-cfeea60dc32e545882047d0ab1d77566a83dcbd3.zip | |
Merge branch 'maint'
* maint:
dialyzer: Add a test of erl_tar:table/1,2
Fix false Dialyzer warnings for erl_tar:table/1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl | 14 | ||||
| -rw-r--r-- | lib/stdlib/src/erl_tar.erl | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl b/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl new file mode 100644 index 0000000000..2dc00d272a --- /dev/null +++ b/lib/dialyzer/test/small_SUITE_data/src/erl_tar_table.erl @@ -0,0 +1,14 @@ +-module(erl_tar_table). + +%% OTP-14860, PR 1670. + +-export([t/0, v/0, x/0]). + +t() -> + {ok, ["file"]} = erl_tar:table("table.tar"). + +v() -> + {ok, [{_,_,_,_,_,_,_}]} = erl_tar:table("table.tar", [verbose]). + +x() -> + {ok, ["file"]} = erl_tar:table("table.tar", []). diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl index 76f0b38108..5ee584d612 100644 --- a/lib/stdlib/src/erl_tar.erl +++ b/lib/stdlib/src/erl_tar.erl @@ -189,7 +189,7 @@ table(Name) -> %% Returns a list of names of the files in the tar file Name. %% Options accepted: compressed, verbose, cooked. -spec table(open_handle(), [compressed | verbose | cooked]) -> - {ok, [tar_entry()]} | {error, term()}. + {ok, [string() | tar_entry()]} | {error, term()}. table(Name, Opts) when is_list(Opts) -> foldl_read(Name, fun table1/4, [], table_opts(Opts)). |