windows.iphlpapi: use follow, it's simpler.

[factor.git] / basis / windows / iphlpapi / iphlpapi.factor

diff --git a/basis/windows/iphlpapi/iphlpapi.factor b/basis/windows/iphlpapi/iphlpapi.factor
index 422d83fbc19282b2902bdf8edd0b133ead2d5e89..8394b3bdf4db9531118d30e91359bef4792c4afb 100644 (file)
--- a/basis/windows/iphlpapi/iphlpapi.factor
+++ b/basis/windows/iphlpapi/iphlpapi.factor
@@ -4,8 +4,8 @@ USING: accessors alien alien.c-types alien.data alien.strings
 alien.syntax arrays byte-arrays classes.struct combinators
 combinators.smart destructors io.encodings.string
 io.encodings.utf8 io.sockets io.sockets.private kernel libc
-make refs sequences sequences.extras windows.errors
-windows.kernel32 windows.types windows.winsock fry ;
+make refs sequences windows.errors windows.kernel32
+windows.types windows.winsock ;
 IN: windows.iphlpapi
 
 LIBRARY: iphlpapi
@@ -141,7 +141,7 @@ ERROR: unknown-sockaddr-length sockaddr length ;
     dup iSockaddrLength>> {
         { 16 [ lpSockaddr>> sockaddr-in memory>struct ] }
         { 28 [ lpSockaddr>> sockaddr-in6 memory>struct ] }
-        [ throw-unknown-sockaddr-length ]
+        [ unknown-sockaddr-length ]
     } case ;
 
 TYPEDEF: SOCKET_ADDRESS* PSOCKET_ADDRESS
@@ -387,7 +387,7 @@ FUNCTION: DWORD GetNetworkParams ( PFIXED_INFO pFixedInfo, PULONG pOutBufLen )
 
 : get-fixed-info ( -- FIXED_INFO )
     FIXED_INFO <struct> dup byte-length ulong <ref>
-    [ GetNetworkParams n>win32-error-check ] 2keep drop ;
+    [ GetNetworkParams n>win32-error-check ] keepd ;
 
 : dns-server-ips ( -- sequence )
     get-fixed-info DnsServerList>> [
@@ -404,7 +404,7 @@ FUNCTION: DWORD GetNetworkParams ( PFIXED_INFO pFixedInfo, PULONG pOutBufLen )
 <PRIVATE
 
 : loop-list ( obj -- seq )
-    [ [ dup [ Next>> ] when ] keep ] loop>array nip ;
+    [ Next>> ] follow ;
 
 ! Don't use this, use each/map-adapters
 : iterate-interfaces ( -- seq )