From f77863a09eebf65299e734d27f1c5b96e9742f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 25 Apr 2016 15:41:59 +0200
Subject: [PATCH] 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'.
---
guix/build/syscalls.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index 45555060f8f..7c32e25971a 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -199,7 +199,7 @@ (define-syntax define-c-struct
(begin
(define (write! bv offset fields ...)
(write-types bv offset (types ...) (fields ...)))
- (define (read bv offset)
+ (define* (read bv #:optional (offset 0))
(read-types wrap-fields bv offset (types ...) ()))))))
@@ -858,8 +858,7 @@ (define (unfold-interface-list ptr)
(result '()))
(if (null-pointer? ptr)
(reverse result)
- (match (read-ifaddrs (pointer->bytevector ptr %sizeof-ifaddrs)
- 0)
+ (match (read-ifaddrs (pointer->bytevector ptr %sizeof-ifaddrs))
((ifaddr . ptr)
(loop ptr (cons ifaddr result)))))))
@@ -921,8 +920,7 @@ (define* (terminal-window-size #:optional (port (current-output-port)))
(ret (%ioctl (fileno port) TIOCGWINSZ size))
(err (errno)))
(if (zero? ret)
- (read-winsize (pointer->bytevector size (sizeof winsize-struct))
- 0)
+ (read-winsize (pointer->bytevector size (sizeof winsize-struct)))
(throw 'system-error "terminal-window-size" "~A"
(list (strerror err))
(list err)))))
--
GitLab