aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2016-02-18 08:51:54 +0100
committerHans Bolinder <[email protected]>2016-02-18 08:51:54 +0100
commit521ed78a48b0e9b9561fc7e5697ce926ce0498c0 (patch)
tree3085fb252858992845d701f6f8055d6ccd1be8fc /lib/kernel
parent0d5820c44dde5875d322a84eab6ce4227fe19bec (diff)
parent061aea4d8ff9b7bac9822317b104431dda0da929 (diff)
downloadotp-521ed78a48b0e9b9561fc7e5697ce926ce0498c0.tar.gz
otp-521ed78a48b0e9b9561fc7e5697ce926ce0498c0.tar.bz2
otp-521ed78a48b0e9b9561fc7e5697ce926ce0498c0.zip
Merge branch 'hb/kernel/correct_contract/OTP-13335' into maint
* hb/kernel/correct_contract/OTP-13335: kernel: Correct contract for inet:getifaddrs/1
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/inet.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index b573112445..c1ae99ea24 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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.
@@ -289,7 +289,7 @@ getifaddrs(Socket) ->
-spec getifaddrs() -> {ok, Iflist} | {error, posix()} when
Iflist :: [{Ifname,[Ifopt]}],
Ifname :: string(),
- Ifopt :: {flag,[Flag]} | {addr,Addr} | {netmask,Netmask}
+ Ifopt :: {flags,[Flag]} | {addr,Addr} | {netmask,Netmask}
| {broadaddr,Broadaddr} | {dstaddr,Dstaddr}
| {hwaddr,Hwaddr},
Flag :: up | broadcast | loopback | pointtopoint