File 5504-Rename-rr_type-dns_rr_type.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 5504-Rename-rr_type-dns_rr_type.patch of Package erlang (Revision 15a42b5a9f7bbf72ee3d2d11dbadf6c5)

Currently displaying revision 15a42b5a9f7bbf72ee3d2d11dbadf6c5 , Show latest

From 4e664c134cf09374b36c59d9960689f25964edb0 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 18 Mar 2022 16:12:06 +0100
Subject: [PATCH 4/5] Rename rr_type() -> dns_rr_type()

---
 lib/kernel/doc/src/inet_res.xml | 10 +++++-----
 lib/kernel/src/inet_res.erl     | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml
index 9f2304a630..8af91052ff 100644
--- a/lib/kernel/doc/src/inet_res.xml
+++ b/lib/kernel/doc/src/inet_res.xml
@@ -117,7 +117,7 @@
 <desc>A string with no adjacent dots.</desc>
 </datatype>
 <datatype>
- <name name="rr_type"/>
+ <name name="dns_rr_type"/>
 </datatype>
 <datatype>
 <name name="dns_class"/>
@@ -153,7 +153,7 @@ dns_header() = DnsHeader
 | {rcode, integer(0..16)} ]
 inet_dns:header(DnsHeader, Field) -> Value
 
-query_type() = axfr | mailb | maila | any | rr_type()
+query_type() = axfr | mailb | maila | any | dns_rr_type()
 
 dns_query() = DnsQuery
 inet_dns:dns_query(DnsQuery) ->
@@ -165,7 +165,7 @@ dns_query() = DnsQuery
 dns_rr() = DnsRr
 inet_dns:rr(DnsRr) -> DnsRrFields | DnsRrOptFields
 DnsRrFields = [ {domain, dns_name()}
- | {type, rr_type()}
+ | {type, dns_rr_type()}
 | {class, dns_class()}
 | {ttl, integer()}
 | {data, dns_data()} ]
@@ -216,9 +216,9 @@ inet_dns:record_type(_) -> undefined.</pre>
 respectively; see
 <seetype marker="inet#hostent"><c>inet:hostent()</c></seetype>.
 When resolving other
- <c><anno>Type</anno>&nbsp;=&nbsp;rr_type()</c>:s
+ <c><anno>Type</anno>&nbsp;=&nbsp;dns_rr_type()</c>:s
 also returns a <c>#hostent{}</c> record but with
- <c>#hostent.h_addrtype&nbsp;=&nbsp;</c><seetype marker="#rr_type"><c>rr_type()</c></seetype>, and
+ <c>#hostent.h_addrtype&nbsp;=&nbsp;</c><seetype marker="#dns_rr_type"><c>dns_rr_type()</c></seetype>, and
 <c>#hostent.h_addr_list&nbsp;=&nbsp;</c>[<seetype marker="#dns_data"><c>dns_data()</c></seetype>]; see
 <seetype marker="#hostent"><c>hostent()</c></seetype>.
 This function uses resolver option <c>search</c> that
diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl
index b0d5b6dc7b..7a61de9714 100644
--- a/lib/kernel/src/inet_res.erl
+++ b/lib/kernel/src/inet_res.erl
@@ -71,7 +71,7 @@
 
 -type dns_name() :: string().
 
--type rr_type() :: a | aaaa | caa | cname | gid | hinfo | ns | mb | md | mg
+-type dns_rr_type() :: a | aaaa | caa | cname | gid | hinfo | ns | mb | md | mg
 | mf | minfo | mx | naptr | null | ptr | soa | spf | srv
 | txt | uid | uinfo | unspec | uri | wks.
 
@@ -109,7 +109,7 @@
 -spec resolve(Name, Class, Type) -> {ok, dns_msg()} | Error when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Error :: {error, Reason} | {error,{Reason,dns_msg()}},
 Reason :: inet:posix() | res_error().
 
@@ -120,7 +120,7 @@ resolve(Name, Class, Type) ->
 {ok, dns_msg()} | Error when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Opts :: [Opt],
 Opt :: res_option() | verbose | atom(),
 Error :: {error, Reason} | {error,{Reason,dns_msg()}},
@@ -133,7 +133,7 @@ resolve(Name, Class, Type, Opts) ->
 {ok, dns_msg()} | Error when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Opts :: [Opt],
 Opt :: res_option() | verbose | atom(),
 Timeout :: timeout(),
@@ -160,7 +160,7 @@ resolve(Name, Class, Type, Opts, Timeout) ->
 -spec lookup(Name, Class, Type) -> [dns_data()] when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type().
+ Type :: dns_rr_type().
 
 lookup(Name, Class, Type) ->
 lookup(Name, Class, Type, []).
@@ -168,7 +168,7 @@ lookup(Name, Class, Type) ->
 -spec lookup(Name, Class, Type, Opts) -> [dns_data()] when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Opts :: [res_option() | verbose].
 
 lookup(Name, Class, Type, Opts) ->
@@ -177,7 +177,7 @@ lookup(Name, Class, Type, Opts) ->
 -spec lookup(Name, Class, Type, Opts, Timeout) -> [dns_data()] when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Opts :: [res_option() | verbose],
 Timeout :: timeout().
 
@@ -203,7 +203,7 @@ lookup_filter({error,_}, _, _) -> [].
 -spec nslookup(Name, Class, Type) -> {ok, dns_msg()} | {error, Reason} when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Reason :: inet:posix() | res_error().
 
 nslookup(Name, Class, Type) ->
@@ -213,14 +213,14 @@ nslookup(Name, Class, Type) ->
 {ok, dns_msg()} | {error, Reason} when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Timeout :: timeout(),
 Reason :: inet:posix() | res_error();
 (Name, Class, Type, Nameservers) ->
 {ok, dns_msg()} | {error, Reason} when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Nameservers :: [nameserver()],
 Reason :: inet:posix() | res_error().
 
@@ -233,7 +233,7 @@ nslookup(Name, Class, Type, NSs) -> % For backwards compatibility
 {ok, dns_msg()} | {error, Reason} when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Nameservers :: [nameserver()],
 Reason :: inet:posix().
 
@@ -244,7 +244,7 @@ nnslookup(Name, Class, Type, NSs) ->
 {ok, dns_msg()} | {error, Reason} when
 Name :: dns_name() | inet:ip_address(),
 Class :: dns_class(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Timeout :: timeout(),
 Nameservers :: [nameserver()],
 Reason :: inet:posix().
@@ -459,13 +459,13 @@ gethostbyname_tm(_Name, _Family, _Timer) ->
 {'hostent',
 H_name :: inet:hostname(),
 H_aliases :: [inet:hostname()],
- H_addrtype :: rr_type(),
+ H_addrtype :: dns_rr_type(),
 H_length :: non_neg_integer(),
 H_addr_list :: [dns_data()]}.
 
 -spec getbyname(Name, Type) -> {ok, Hostent} | {error, Reason} when
 Name :: dns_name(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Hostent :: inet:hostent() | hostent(),
 Reason :: inet:posix() | res_error().
 
@@ -474,7 +474,7 @@ getbyname(Name, Type) ->
 
 -spec getbyname(Name, Type, Timeout) -> {ok, Hostent} | {error, Reason} when
 Name :: dns_name(),
- Type :: rr_type(),
+ Type :: dns_rr_type(),
 Timeout :: timeout(),
 Hostent :: inet:hostent() | hostent(),
 Reason :: inet:posix() | res_error().
-- 
2.34.1

Places

File 5504-Rename-rr_type-dns_rr_type.patch of Package erlang (Revision 15a42b5a9f7bbf72ee3d2d11dbadf6c5)

Places