diff options
| author | Lars Thorsen <[email protected]> | 2016-05-13 08:26:58 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2016-05-18 15:23:08 +0200 |
| commit | 07906b7d9f1c2f72810d9ae12b38415cc3c1e86d (patch) | |
| tree | 0b3e134337ed66530c66e0211a647a439507f1ce /lib/inets/src/tftp | |
| parent | a1086ac00ece8044b4055047aaac2f912a5ca18e (diff) | |
| download | otp-07906b7d9f1c2f72810d9ae12b38415cc3c1e86d.tar.gz otp-07906b7d9f1c2f72810d9ae12b38415cc3c1e86d.tar.bz2 otp-07906b7d9f1c2f72810d9ae12b38415cc3c1e86d.zip | |
[inets] Remove usage of erlang:now()
Diffstat (limited to 'lib/inets/src/tftp')
| -rw-r--r-- | lib/inets/src/tftp/tftp_logger.erl | 4 | ||||
| -rw-r--r-- | lib/inets/src/tftp/tftp_sup.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/src/tftp/tftp_logger.erl b/lib/inets/src/tftp/tftp_logger.erl index 5e5d1d56c7..a869958484 100644 --- a/lib/inets/src/tftp/tftp_logger.erl +++ b/lib/inets/src/tftp/tftp_logger.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2015. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. 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. @@ -85,7 +85,7 @@ info_msg(Format, Data) -> %%------------------------------------------------------------------- add_timestamp(Format, Data) -> - Time = inets_time_compat:timestamp(), + Time = erlang:timestamp(), {{_Y, _Mo, _D}, {H, Mi, S}} = calendar:now_to_universal_time(Time), %% {"~p-~s-~sT~s:~s:~sZ,~6.6.0w tftp: " ++ Format ++ "\n", %% [Y, t(Mo), t(D), t(H), t(Mi), t(S), MicroSecs | Data]}. diff --git a/lib/inets/src/tftp/tftp_sup.erl b/lib/inets/src/tftp/tftp_sup.erl index 98b92cc87c..40b67c499c 100644 --- a/lib/inets/src/tftp/tftp_sup.erl +++ b/lib/inets/src/tftp/tftp_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2015. All Rights Reserved. +%% Copyright Ericsson AB 2005-2016. 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. @@ -94,7 +94,7 @@ unique_name(Options) -> {value, {_, Port}} when is_integer(Port), Port > 0 -> {tftpd, Port}; _ -> - {tftpd, inets_time_compat:unique_integer([positive])} + {tftpd, erlang:unique_integer([positive])} end. default_kill_after() -> |