From: Chris Hanson Date: Sun, 11 Jun 2006 03:04:17 +0000 (+0000) Subject: Repaginate. X-Git-Tag: 20090517-FFI~1015 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=87999bd167d9a84bcf0d9f0a05ccd11691945cbc;p=mit-scheme.git Repaginate. --- diff --git a/v7/src/runtime/socket.scm b/v7/src/runtime/socket.scm index 8b6a6885e..241f59100 100644 --- a/v7/src/runtime/socket.scm +++ b/v7/src/runtime/socket.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: socket.scm,v 1.27 2006/06/11 03:03:22 cph Exp $ +$Id: socket.scm,v 1.28 2006/06/11 03:04:17 cph Exp $ Copyright 1996,1997,1998,1999,2001,2002 Massachusetts Institute of Technology Copyright 2003,2004,2005,2006 Massachusetts Institute of Technology @@ -29,35 +29,6 @@ USA. (declare (usual-integrations)) -(define (open-tcp-stream-socket host-name service) - (let ((channel (open-tcp-stream-socket-channel host-name service))) - (make-generic-i/o-port channel channel))) - -(define (open-unix-stream-socket filename) - (let ((channel (open-unix-stream-socket-channel filename))) - (make-generic-i/o-port channel channel))) - -(define (open-tcp-stream-socket-channel host-name service) - (let ((host - (vector-ref (or (get-host-by-name host-name) - (error:bad-range-argument - host-name - 'open-tcp-stream-socket-channel)) - 0)) - (port (tcp-service->port service))) - (open-channel - (lambda (p) - (with-thread-timer-stopped - (lambda () - ((ucode-primitive new-open-tcp-stream-socket 3) host port p))))))) - -(define (open-unix-stream-socket-channel filename) - (open-channel - (lambda (p) - (with-thread-timer-stopped - (lambda () - ((ucode-primitive new-open-unix-stream-socket 2) filename p)))))) - (define (open-tcp-server-socket service #!optional host) (let ((server-socket (create-tcp-server-socket))) (bind-tcp-server-socket server-socket @@ -125,6 +96,35 @@ USA. (and channel (make-generic-i/o-port channel channel)))) +(define (open-tcp-stream-socket host-name service) + (let ((channel (open-tcp-stream-socket-channel host-name service))) + (make-generic-i/o-port channel channel))) + +(define (open-unix-stream-socket filename) + (let ((channel (open-unix-stream-socket-channel filename))) + (make-generic-i/o-port channel channel))) + +(define (open-tcp-stream-socket-channel host-name service) + (let ((host + (vector-ref (or (get-host-by-name host-name) + (error:bad-range-argument + host-name + 'open-tcp-stream-socket-channel)) + 0)) + (port (tcp-service->port service))) + (open-channel + (lambda (p) + (with-thread-timer-stopped + (lambda () + ((ucode-primitive new-open-tcp-stream-socket 3) host port p))))))) + +(define (open-unix-stream-socket-channel filename) + (open-channel + (lambda (p) + (with-thread-timer-stopped + (lambda () + ((ucode-primitive new-open-unix-stream-socket 2) filename p)))))) + (define (get-host-by-name host-name) (with-thread-timer-stopped (lambda ()