diff options
| author | Luke Randall <[email protected]> | 2023-12-06 17:31:53 +0000 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2023-12-25 21:12:49 +0900 |
| commit | da77c79d80a615130bc67b42d3795db2a3fdd3fe (patch) | |
| tree | 467a282658ed47200845f1c81aad3c9ae5b15af5 | |
| parent | eb53131367d6e1d3da16b0cd6bc44284ea3589ea (diff) | |
[ruby/ipaddr] Fix regressions in exception messages
Changes introduced by 09edfd4 have broken some exception
messages, and added the address as an unnecessary
suffix in others.
https://github.com/ruby/ipaddr/commit/74a043109c
| -rw-r--r-- | lib/ipaddr.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 07ef67a942..70f885fe17 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -437,7 +437,7 @@ class IPAddr when Integer mask!(prefix) else - raise InvalidPrefixError, "prefix must be an integer: #{@addr}" + raise InvalidPrefixError, "prefix must be an integer" end end @@ -511,11 +511,11 @@ class IPAddr case family[0] ? family[0] : @family when Socket::AF_INET if addr < 0 || addr > IN4MASK - raise InvalidAddressError, "invalid address: #{@addr}" + raise InvalidAddressError, "invalid address: #{addr}" end when Socket::AF_INET6 if addr < 0 || addr > IN6MASK - raise InvalidAddressError, "invalid address: #{@addr}" + raise InvalidAddressError, "invalid address: #{addr}" end else raise AddressFamilyError, "unsupported address family" @@ -542,12 +542,12 @@ class IPAddr else m = IPAddr.new(mask) if m.family != @family - raise InvalidPrefixError, "address family is not same: #{@addr}" + raise InvalidPrefixError, "address family is not same" end @mask_addr = m.to_i n = @mask_addr ^ m.instance_variable_get(:@mask_addr) unless ((n + 1) & n).zero? - raise InvalidPrefixError, "invalid mask #{mask}: #{@addr}" + raise InvalidPrefixError, "invalid mask #{mask}" end @addr &= @mask_addr return self @@ -558,13 +558,13 @@ class IPAddr case @family when Socket::AF_INET if prefixlen < 0 || prefixlen > 32 - raise InvalidPrefixError, "invalid length: #{@addr}" + raise InvalidPrefixError, "invalid length" end masklen = 32 - prefixlen @mask_addr = ((IN4MASK >> masklen) << masklen) when Socket::AF_INET6 if prefixlen < 0 || prefixlen > 128 - raise InvalidPrefixError, "invalid length: #{@addr}" + raise InvalidPrefixError, "invalid length" end masklen = 128 - prefixlen @mask_addr = ((IN6MASK >> masklen) << masklen) |