aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-06-07 16:26:58 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-06-07 16:26:58 +0200
commitab83998ecacc84b71bd5f30f70d7f2fc410a9edc (patch)
tree2a706040b2fe9b8764c72e2084d251448f41e0af /lib/kernel
parent8cb4d5246ee4901ebbdc7e34f1eedc75598928fe (diff)
parent612de104d23a01d5753ca39f4db4e14ba0234897 (diff)
downloadotp-ab83998ecacc84b71bd5f30f70d7f2fc410a9edc.tar.gz
otp-ab83998ecacc84b71bd5f30f70d7f2fc410a9edc.tar.bz2
otp-ab83998ecacc84b71bd5f30f70d7f2fc410a9edc.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/inet_dns_record_adts.pl12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/kernel/src/inet_dns_record_adts.pl b/lib/kernel/src/inet_dns_record_adts.pl
index b1d8fab939..da50c7114f 100644
--- a/lib/kernel/src/inet_dns_record_adts.pl
+++ b/lib/kernel/src/inet_dns_record_adts.pl
@@ -2,7 +2,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2009. All Rights Reserved.
+# Copyright Ericsson AB 2009-2011. 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
@@ -73,6 +73,10 @@ while( my ($Name, $r) = each(%Names)) {
# "@Values" = "V1,V2"...",VN"
my @D = @DATA;
foreach my $line (@D) {
+ # Ignore !name lines
+ if ($line =~ s/^\!(\S+)\s+//) {
+ next if $1 eq $Name;
+ }
my $m = 1;
# For leading * iterate $n times, otherwise once
$line =~ s/^\s*[*]// and $m = $n;
@@ -155,9 +159,9 @@ make_Name() -> \
make_Name(L) when is_list(L) -> \
make_Name(#Record{}, L).
-%% Generate #Record{} with one updated field
-%%
-*make_Name(Field, Value) -> \
+!dns_rr_opt %% Generate #Record{} with one updated field
+!dns_rr_opt %%
+!dns_rr_opt *make_Name(Field, Value) -> \
#Record{Field=Value};
%%
%% Update #Record{} from property list