diff options
| author | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
| commit | 3536111957c809976ed3e7091e85960990be904d (patch) | |
| tree | aafc4cf4f996ece272e6b9c3d2366061c34f08da /lib/stdlib/src/zip.erl | |
| parent | a7c0e439ee84d25ce18f65959be06315063a7de8 (diff) | |
| parent | 0c09797c725c98e5466bf6c575b7be4f2fc0e813 (diff) | |
| download | otp-3536111957c809976ed3e7091e85960990be904d.tar.gz otp-3536111957c809976ed3e7091e85960990be904d.tar.bz2 otp-3536111957c809976ed3e7091e85960990be904d.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/stdlib/src/zip.erl')
| -rw-r--r-- | lib/stdlib/src/zip.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/src/zip.erl b/lib/stdlib/src/zip.erl index 524d709431..c82c8159b6 100644 --- a/lib/stdlib/src/zip.erl +++ b/lib/stdlib/src/zip.erl @@ -223,7 +223,7 @@ openzip_open(F, Options) -> do_openzip_open(F, Options) -> Opts = get_openzip_options(Options), #openzip_opts{output = Output, open_opts = OpO, cwd = CWD} = Opts, - Input = get_zip_input(F), + Input = get_input(F), In0 = Input({open, F, OpO -- [write]}, []), {[#zip_comment{comment = C} | Files], In1} = get_central_dir(In0, fun raw_file_info_etc/5, Input), @@ -489,7 +489,7 @@ do_list_dir(F, Options) -> %% Print zip directory in short form -spec(t(Archive) -> ok when - Archive :: file:name() | binary | ZipHandle, + Archive :: file:name() | binary() | ZipHandle, ZipHandle :: pid()). t(F) when is_pid(F) -> zip_t(F); @@ -513,7 +513,7 @@ do_t(F, RawPrint) -> %% Print zip directory in long form (like ls -l) -spec(tt(Archive) -> ok when - Archive :: file:name() | binary | ZipHandle, + Archive :: file:name() | binary() | ZipHandle, ZipHandle :: pid()). tt(F) when is_pid(F) -> zip_tt(F); @@ -1174,7 +1174,7 @@ zip_get(Pid) when is_pid(Pid) -> zip_close(Pid) when is_pid(Pid) -> request(self(), Pid, close). --spec(zip_get(FileName, ZipHandle) -> {ok, [Result]} | {error, Reason} when +-spec(zip_get(FileName, ZipHandle) -> {ok, Result} | {error, Reason} when FileName :: file:name(), ZipHandle :: pid(), Result :: file:name() | {file:name(), binary()}, @@ -1183,7 +1183,7 @@ zip_close(Pid) when is_pid(Pid) -> zip_get(FileName, Pid) when is_pid(Pid) -> request(self(), Pid, {get, FileName}). --spec(zip_list_dir(ZipHandle) -> Result | {error, Reason} when +-spec(zip_list_dir(ZipHandle) -> {ok, Result} | {error, Reason} when Result :: [zip_comment() | zip_file()], ZipHandle :: pid(), Reason :: term()). |