diff options
author | Björn-Egil Dahlberg <[email protected]> | 2011-12-07 15:53:21 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2011-12-08 14:12:03 +0100 |
commit | a37f854be3aaee3786d555a28bb4c8d53384a852 (patch) | |
tree | 567e23d85a3802e48bb0a40c6318a26f51eef87b /erts/preloaded/src | |
parent | 9158448a508e3e919739dbee0e8e0cad32445941 (diff) | |
download | otp-a37f854be3aaee3786d555a28bb4c8d53384a852.tar.gz otp-a37f854be3aaee3786d555a28bb4c8d53384a852.tar.bz2 otp-a37f854be3aaee3786d555a28bb4c8d53384a852.zip |
Change options to prim_file:*_file_info/*
* 'utc' changed to 'universal'
* 'epoch' changed to 'posix'
This change conforms to other naming already in OTP, e.g.
erlang:universaltime_to_localtime/1.
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r-- | erts/preloaded/src/prim_file.erl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl index 2567388a6a..e5cb1d5c03 100644 --- a/erts/preloaded/src/prim_file.erl +++ b/erts/preloaded/src/prim_file.erl @@ -810,9 +810,9 @@ write_file_info_int(Port, File, file_info_validate_atime(Atime, _) when Atime =/= undefined -> Atime; -file_info_validate_atime(undefined, local) -> erlang:localtime(); -file_info_validate_atime(undefined, utc) -> erlang:universaltime(); -file_info_validate_atime(undefined, epoch) -> erlang:universaltime_to_seconds((erlang:universaltime())). +file_info_validate_atime(undefined, local) -> erlang:localtime(); +file_info_validate_atime(undefined, universal) -> erlang:universaltime(); +file_info_validate_atime(undefined, posix) -> erlang:universaltime_to_seconds((erlang:universaltime())). file_info_validate_mtime(undefined, Atime) -> Atime; file_info_validate_mtime(Mtime, _) -> Mtime. @@ -1343,19 +1343,19 @@ plgv(_, [], D) -> D. %% %% We don't actually want this here -%% We want to use epochs in all prim but erl_prim_loader makes that tricky +%% We want to use posix time in all prim but erl_prim_loader makes that tricky %% It is probably needed to redo the whole erl_prim_loader -from_seconds(Seconds, epoch) when is_integer(Seconds) -> +from_seconds(Seconds, posix) when is_integer(Seconds) -> Seconds; -from_seconds(Seconds, utc) when is_integer(Seconds) -> +from_seconds(Seconds, universal) when is_integer(Seconds) -> erlang:seconds_to_universaltime(Seconds); from_seconds(Seconds, local) when is_integer(Seconds) -> erlang:universaltime_to_localtime(erlang:seconds_to_universaltime(Seconds)). -to_seconds(Seconds, epoch) when is_integer(Seconds) -> +to_seconds(Seconds, posix) when is_integer(Seconds) -> Seconds; -to_seconds({_,_} = Datetime, utc) -> +to_seconds({_,_} = Datetime, universal) -> erlang:universaltime_to_seconds(Datetime); to_seconds({_,_} = Datetime, local) -> erlang:universaltime_to_seconds(erlang:localtime_to_universaltime(Datetime)). |