From e732dca7629edb503df0c65df5f37a99600d567d Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 25 Mar 2025 01:33:37 +0900 Subject: [PATCH] wl: fix sync pipe keepalive Signed-off-by: Ophestra --- wl/conn.go | 6 +++--- wl/wl.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wl/conn.go b/wl/conn.go index 1a7cba6..9baa5ab 100644 --- a/wl/conn.go +++ b/wl/conn.go @@ -94,7 +94,7 @@ func bindRawConn(done chan struct{}, rc syscall.RawConn, p, appID, instanceID st // keep socket alive until done is requested <-done - runtime.KeepAlive(syncPipe[1].Fd()) + runtime.KeepAlive(syncPipe[1]) }); err != nil { setupDone <- err } @@ -107,7 +107,7 @@ func bindRawConn(done chan struct{}, rc syscall.RawConn, p, appID, instanceID st return syncPipe[1], <-setupDone } -func bind(fd uintptr, p, appID, instanceID string, syncFD uintptr) error { +func bind(fd uintptr, p, appID, instanceID string, syncFd uintptr) error { // ensure p is available if f, err := os.Create(p); err != nil { return err @@ -117,5 +117,5 @@ func bind(fd uintptr, p, appID, instanceID string, syncFD uintptr) error { return err } - return bindWaylandFd(p, fd, appID, instanceID, syncFD) + return bindWaylandFd(p, fd, appID, instanceID, syncFd) } diff --git a/wl/wl.go b/wl/wl.go index 51ad1fd..f75f063 100644 --- a/wl/wl.go +++ b/wl/wl.go @@ -25,11 +25,11 @@ var resErr = [...]error{ 2: errors.New("wp_security_context_v1 not available"), } -func bindWaylandFd(socketPath string, fd uintptr, appID, instanceID string, syncFD uintptr) error { +func bindWaylandFd(socketPath string, fd uintptr, appID, instanceID string, syncFd uintptr) error { if hasNull(appID) || hasNull(instanceID) { return ErrContainsNull } - res := C.f_bind_wayland_fd(C.CString(socketPath), C.int(fd), C.CString(appID), C.CString(instanceID), C.int(syncFD)) + res := C.f_bind_wayland_fd(C.CString(socketPath), C.int(fd), C.CString(appID), C.CString(instanceID), C.int(syncFd)) return resErr[int32(res)] }