diff options
| author | Björn Gustavsson <[email protected]> | 2014-06-17 11:06:52 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-06-17 11:06:52 +0200 |
| commit | ef1a60edd1cb8f1fffc4fa3b1995914efff5393d (patch) | |
| tree | 62815b12dcb69906b2145a54b17d383438d4a213 /lib/kernel | |
| parent | efcd03504202c288047311368a729bc83f71ecaa (diff) | |
| parent | a182917681b28ec7129adf73d863fa6b11670c10 (diff) | |
| download | otp-ef1a60edd1cb8f1fffc4fa3b1995914efff5393d.tar.gz otp-ef1a60edd1cb8f1fffc4fa3b1995914efff5393d.tar.bz2 otp-ef1a60edd1cb8f1fffc4fa3b1995914efff5393d.zip | |
Merge branch 'maint'
* maint:
Fix handling of latin1 characters in false ifdef branches
add_abstract_code: Remove 'from_asm' option
Remove documentation and stub for non-exist file:file_info/1
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/doc/src/file.xml | 8 | ||||
| -rw-r--r-- | lib/kernel/src/file.erl | 10 |
2 files changed, 1 insertions, 17 deletions
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml index 8dae34431b..1c03efe7fd 100644 --- a/lib/kernel/doc/src/file.xml +++ b/lib/kernel/doc/src/file.xml @@ -428,14 +428,6 @@ </desc> </func> <func> - <name name="file_info" arity="1"/> - <fsummary>Get information about a file (deprecated)</fsummary> - <desc> - <p>This function is obsolete. Use <c>read_file_info/1,2</c> - instead.</p> - </desc> - </func> - <func> <name name="format_error" arity="1"/> <fsummary>Return a descriptive string for an error reason</fsummary> <desc> diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl index 20b703e084..ee2fb85de2 100644 --- a/lib/kernel/src/file.erl +++ b/lib/kernel/src/file.erl @@ -117,15 +117,7 @@ | {'time', 'posix'}. %%% BIFs --export([file_info/1, native_name_encoding/0]). - --spec file_info(Filename) -> {ok, FileInfo} | {error, Reason} when - Filename :: name_all(), - FileInfo :: file_info(), - Reason :: posix() | badarg. - -file_info(_) -> - erlang:nif_error(undef). +-export([native_name_encoding/0]). -spec native_name_encoding() -> latin1 | utf8. |