mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 01:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-10-21 00:01:19 +01:00
parent af2d48f4d2 076034345a
commit 1f4a5b5dfe
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-queue.c
View File

@@ -203,8 +203,8 @@ cmdq_continue(struct cmd_q *cmdq)
cmdq->references++; cmdq->references++;
notify_disable(); notify_disable();
log_debug("continuing cmdq %p: flags=%#x, client=%d", cmdq, cmdq->flags, log_debug("continuing cmdq %p: flags %#x, client %p", cmdq, cmdq->flags,
c != NULL ? c->ibuf.fd : -1); c);
empty = TAILQ_EMPTY(&cmdq->queue); empty = TAILQ_EMPTY(&cmdq->queue);
if (empty) if (empty)

5
cmd-wait-for.c
View File

@@ -170,12 +170,11 @@ cmd_wait_for_wait(struct cmd_q *cmdq, const char *name,
wc = cmd_wait_for_add(name); wc = cmd_wait_for_add(name);
if (wc->woken) { if (wc->woken) {
log_debug("wait channel %s already woken (client %d)", wc->name, log_debug("wait channel %s already woken (%p)", wc->name, c);
c->tty.fd);
cmd_wait_for_remove(wc); cmd_wait_for_remove(wc);
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);
} }
log_debug("wait channel %s not woken (client %d)", wc->name, c->tty.fd); log_debug("wait channel %s not woken (%p)", wc->name, c);
TAILQ_INSERT_TAIL(&wc->waiters, cmdq, waitentry); TAILQ_INSERT_TAIL(&wc->waiters, cmdq, waitentry);
cmdq->references++; cmdq->references++;

10
server-client.c
View File

@@ -130,7 +130,7 @@ server_client_create(int fd)
evtimer_set(&c->repeat_timer, server_client_repeat_timer, c); evtimer_set(&c->repeat_timer, server_client_repeat_timer, c);
TAILQ_INSERT_TAIL(&clients, c, entry); TAILQ_INSERT_TAIL(&clients, c, entry);
log_debug("new client %d", fd); log_debug("new client %p", c);
} }
/* Open client terminal if needed. */ /* Open client terminal if needed. */
@@ -171,7 +171,7 @@ server_client_lost(struct client *c)
c->stdin_callback(c, 1, c->stdin_callback_data); c->stdin_callback(c, 1, c->stdin_callback_data);
TAILQ_REMOVE(&clients, c, entry); TAILQ_REMOVE(&clients, c, entry);
log_debug("lost client %d", c->ibuf.fd); log_debug("lost client %p", c);
/* /*
* If CLIENT_TERMINAL hasn't been set, then tty_init hasn't been called * If CLIENT_TERMINAL hasn't been set, then tty_init hasn't been called
@@ -237,7 +237,7 @@ server_client_lost(struct client *c)
void void
server_client_unref(struct client *c) server_client_unref(struct client *c)
{ {
log_debug("unref client %d (%d references)", c->ibuf.fd, c->references); log_debug("unref client %p (%d references)", c, c->references);
c->references--; c->references--;
if (c->references == 0) if (c->references == 0)
@@ -250,7 +250,7 @@ server_client_free(unused int fd, unused short events, void *arg)
{ {
struct client *c = arg; struct client *c = arg;
log_debug("free client %d (%d references)", c->ibuf.fd, c->references); log_debug("free client %p (%d references)", c, c->references);
if (c->references == 0) if (c->references == 0)
free(c); free(c);
@@ -1007,7 +1007,7 @@ server_client_msg_dispatch(struct client *c)
continue; continue;
} }
log_debug("got %u from client %d", imsg.hdr.type, c->ibuf.fd); log_debug("got %u from client %p", imsg.hdr.type, c);
switch (imsg.hdr.type) { switch (imsg.hdr.type) {
case MSG_IDENTIFY_FLAGS: case MSG_IDENTIFY_FLAGS:
case MSG_IDENTIFY_TERM: case MSG_IDENTIFY_TERM:

2
server-fn.c
View File

@@ -64,7 +64,7 @@ server_write_client(struct client *c, enum msgtype type, const void *buf,
if (c->flags & CLIENT_BAD) if (c->flags & CLIENT_BAD)
return (-1); return (-1);
log_debug("writing %d to client %d", type, c->ibuf.fd); log_debug("writing %d to client %p", type, c);
error = imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1, error = imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1,
(void *) buf, len); (void *) buf, len);
if (error == 1) if (error == 1)

2
status.c
View File

@@ -164,7 +164,7 @@ status_timer_callback(unused int fd, unused short events, void *arg)
if (tv.tv_sec != 0) if (tv.tv_sec != 0)
evtimer_add(&c->status_timer, &tv); evtimer_add(&c->status_timer, &tv);
log_debug("client %d, status interval %d", c->ibuf.fd, (int)tv.tv_sec); log_debug("client %p, status interval %d", c, (int)tv.tv_sec);
} }
/* Start status timer for client. */ /* Start status timer for client. */