From 2fb36ea1c554e50f283c5f83e24e91eaa7ec6aa5 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 24 Sep 2010 01:17:33 -0700 Subject: [PATCH] io.sockets: minor cleanup --- basis/io/sockets/sockets.factor | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor index b2860b7f4a..a48e6ffc95 100644 --- a/basis/io/sockets/sockets.factor +++ b/basis/io/sockets/sockets.factor @@ -256,7 +256,6 @@ TUPLE: datagram-port < port addr ; HOOK: (datagram) io-backend ( addr -- datagram ) - TUPLE: raw-port < port addr ; HOOK: (raw) io-backend ( addr -- raw ) @@ -353,8 +352,7 @@ SYMBOL: remote-address MEMO: ipv6-supported? ( -- ? ) [ "::1" 0 binary dispose t ] [ drop f ] recover ; -[ \ ipv6-supported? reset-memoized ipv6-supported? drop ] -"ipv6-support-check" add-startup-hook +[ \ ipv6-supported? reset-memoized ] "io.sockets" add-startup-hook GENERIC: resolve-host ( addrspec -- seq ) @@ -390,11 +388,10 @@ M: f resolve-host drop resolve-localhost ; M: object resolve-localhost - ipv6-supported? [ - { T{ ipv4 f "0.0.0.0" } T{ ipv6 f "::" } } - ] [ - { T{ ipv4 f "0.0.0.0" } } - ] if ; + ipv6-supported? + { T{ ipv4 f "0.0.0.0" } T{ ipv6 f "::" } } + { T{ ipv4 f "0.0.0.0" } } + ? ; : host-name ( -- string ) 256 dup dup length gethostname