Skip to content
Snippets Groups Projects
Unverified Commit f77863a0 authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

syscalls: Second argument of packed-struct read is now optional.

* guix/build/syscalls.scm (define-c-struct)[read]: OFFSET defaults to 0.
(unfold-interface-list): Remove second argument to 'read-ifaddrs'.
(terminal-window-size): Remove second argument to 'read-winsize'.
parent 73f38d5f
No related branches found
No related tags found
No related merge requests found
...@@ -199,7 +199,7 @@ (define-syntax define-c-struct ...@@ -199,7 +199,7 @@ (define-syntax define-c-struct
(begin (begin
(define (write! bv offset fields ...) (define (write! bv offset fields ...)
(write-types bv offset (types ...) (fields ...))) (write-types bv offset (types ...) (fields ...)))
(define (read bv offset) (define* (read bv #:optional (offset 0))
(read-types wrap-fields bv offset (types ...) ())))))) (read-types wrap-fields bv offset (types ...) ()))))))
...@@ -858,8 +858,7 @@ (define (unfold-interface-list ptr) ...@@ -858,8 +858,7 @@ (define (unfold-interface-list ptr)
(result '())) (result '()))
(if (null-pointer? ptr) (if (null-pointer? ptr)
(reverse result) (reverse result)
(match (read-ifaddrs (pointer->bytevector ptr %sizeof-ifaddrs) (match (read-ifaddrs (pointer->bytevector ptr %sizeof-ifaddrs))
0)
((ifaddr . ptr) ((ifaddr . ptr)
(loop ptr (cons ifaddr result))))))) (loop ptr (cons ifaddr result)))))))
...@@ -921,8 +920,7 @@ (define* (terminal-window-size #:optional (port (current-output-port))) ...@@ -921,8 +920,7 @@ (define* (terminal-window-size #:optional (port (current-output-port)))
(ret (%ioctl (fileno port) TIOCGWINSZ size)) (ret (%ioctl (fileno port) TIOCGWINSZ size))
(err (errno))) (err (errno)))
(if (zero? ret) (if (zero? ret)
(read-winsize (pointer->bytevector size (sizeof winsize-struct)) (read-winsize (pointer->bytevector size (sizeof winsize-struct)))
0)
(throw 'system-error "terminal-window-size" "~A" (throw 'system-error "terminal-window-size" "~A"
(list (strerror err)) (list (strerror err))
(list err))))) (list err)))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment