diff options
| author | Hans Bolinder <[email protected]> | 2014-02-21 08:23:12 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2014-02-21 08:23:12 +0100 |
| commit | ee884bd7d33c206d03fa57202986d39b5cd45710 (patch) | |
| tree | c7660a81f67107fff708688d34732aa2edc28e74 /lib | |
| parent | 08b974280d05b136f6c2742ad8db0910356c5fd8 (diff) | |
| parent | 5605ed452429d3ec037e86708da357ffff46d5bc (diff) | |
| download | otp-ee884bd7d33c206d03fa57202986d39b5cd45710.tar.gz otp-ee884bd7d33c206d03fa57202986d39b5cd45710.tar.bz2 otp-ee884bd7d33c206d03fa57202986d39b5cd45710.zip | |
Merge branch 'hb/kernel/spec_bug_fix/OTP-11730'
* hb/kernel/spec_bug_fix/OTP-11730:
Correct the contract of inet:ntoa/1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/inet.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 792593246a..41d422d7d4 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2013. All Rights Reserved. +%% Copyright Ericsson AB 1997-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -597,8 +597,7 @@ getservbyname(Name, Protocol) when is_atom(Name) -> Error -> Error end. --spec ntoa(IpAddress) -> - {ok, Address} | {error, einval} when +-spec ntoa(IpAddress) -> Address | {error, einval} when Address :: string(), IpAddress :: ip_address(). ntoa(Addr) -> |