mirror of
https://github.com/tmux/tmux.git
synced 2026-10-12 13:44:44 +00:00
Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'
* refs/remotes/tmux-openbsd/master: Switch from imsg_get to imsgbuf_get and switch type of n to int.
This commit is contained in:
6
proc.c
6
proc.c
@@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: proc.c,v 1.31 2026/06/08 21:38:19 nicm Exp $ */
|
/* $OpenBSD: proc.c,v 1.32 2026/08/04 13:16:03 claudio Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
|
* Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||||
@@ -79,7 +79,7 @@ static void
|
|||||||
proc_event_cb(__unused int fd, short events, void *arg)
|
proc_event_cb(__unused int fd, short events, void *arg)
|
||||||
{
|
{
|
||||||
struct tmuxpeer *peer = arg;
|
struct tmuxpeer *peer = arg;
|
||||||
ssize_t n;
|
int n;
|
||||||
struct imsg imsg;
|
struct imsg imsg;
|
||||||
|
|
||||||
if (!(peer->flags & PEER_BAD) && (events & EV_READ)) {
|
if (!(peer->flags & PEER_BAD) && (events & EV_READ)) {
|
||||||
@@ -88,7 +88,7 @@ proc_event_cb(__unused int fd, short events, void *arg)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (;;) {
|
for (;;) {
|
||||||
if ((n = imsg_get(&peer->ibuf, &imsg)) == -1) {
|
if ((n = imsgbuf_get(&peer->ibuf, &imsg)) == -1) {
|
||||||
peer->dispatchcb(NULL, peer->arg);
|
peer->dispatchcb(NULL, peer->arg);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user