]> gitweb.factorcode.org Git - factor.git/commitdiff
io.sockets: minor cleanup
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 24 Sep 2010 08:17:33 +0000 (01:17 -0700)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Fri, 24 Sep 2010 08:17:33 +0000 (01:17 -0700)
basis/io/sockets/sockets.factor

index b2860b7f4abb7e9c1dc269c751f3bdc70db82ecb..a48e6ffc95963b0211c9e421bb67a2a700882a50 100644 (file)
@@ -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 <inet6> binary <server> 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 <byte-array> dup dup length gethostname