extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-02-02 11:29:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor tidying; remove some old debugging messages.

Browse Source
This commit is contained in:
Nicholas Marriott 2009-01-07 22:57:03 +00:00
parent 4846ad1657
commit d531dbb53a
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -53,3 +53,4 @@
- document status line options, title bits - document status line options, title bits
- document window options changes - document window options changes
- more # commands in status-left,right eg #H for hostname. others? - more # commands in status-left,right eg #H for hostname. others?
- input.c is too complicated. simplify?

3
client-msg.c
View File

@ -1,4 +1,4 @@
/* $Id: client-msg.c,v 1.15 2009-01-07 22:52:33 nicm Exp $ */ /* $Id: client-msg.c,v 1.16 2009-01-07 22:57:03 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -34,7 +34,6 @@ int client_msg_fn_pause(struct hdr *, struct client_ctx *, char **);
struct client_msg { struct client_msg {
enum hdrtype type; enum hdrtype type;
int (*fn)(struct hdr *, struct client_ctx *, char **); int (*fn)(struct hdr *, struct client_ctx *, char **);
}; };
struct client_msg client_msg_table[] = { struct client_msg client_msg_table[] = {

3
server-msg.c
View File

@ -1,4 +1,4 @@
/* $Id: server-msg.c,v 1.53 2009-01-07 22:52:33 nicm Exp $ */ /* $Id: server-msg.c,v 1.54 2009-01-07 22:57:03 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -39,7 +39,6 @@ void printflike2 server_msg_fn_command_info(
struct server_msg { struct server_msg {
enum hdrtype type; enum hdrtype type;
int (*fn)(struct hdr *, struct client *); int (*fn)(struct hdr *, struct client *);
}; };
const struct server_msg server_msg_table[] = { const struct server_msg server_msg_table[] = {

10
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.88 2009-01-06 15:37:15 nicm Exp $ */ /* $Id: server.c,v 1.89 2009-01-07 22:57:03 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -191,14 +191,12 @@ server_main(const char *srv_path, int srv_fd)
xtimeout = 100; xtimeout = 100;
/* Do the poll. */ /* Do the poll. */
/* log_debug("polling %d fds", nfds); */
if ((nfds = poll(pfds, nfds, xtimeout)) == -1) { if ((nfds = poll(pfds, nfds, xtimeout)) == -1) {
if (errno == EAGAIN || errno == EINTR) if (errno == EAGAIN || errno == EINTR)
continue; continue;
fatal("poll failed"); fatal("poll failed");
} }
pfd = pfds; pfd = pfds;
/* log_debug("poll returned %d", nfds); */
/* Handle server socket. */ /* Handle server socket. */
#ifndef BROKEN_POLL #ifndef BROKEN_POLL
@ -273,7 +271,6 @@ server_fill_windows(struct pollfd **pfd)
(*pfd)->events = POLLIN; (*pfd)->events = POLLIN;
if (BUFFER_USED(w->out) > 0) if (BUFFER_USED(w->out) > 0)
(*pfd)->events |= POLLOUT; (*pfd)->events |= POLLOUT;
/* log_debug("adding window %d (%d)", (*pfd)->fd, w->fd); */
} }
(*pfd)++; (*pfd)++;
} }
@ -288,7 +285,6 @@ server_handle_windows(struct pollfd **pfd)
for (i = 0; i < ARRAY_LENGTH(&windows); i++) { for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
if ((w = ARRAY_ITEM(&windows, i)) != NULL && w->fd != -1) { if ((w = ARRAY_ITEM(&windows, i)) != NULL && w->fd != -1) {
/* log_debug("testing window %d (%d)", (*pfd)->fd, w->fd); */
if (buffer_poll(*pfd, w->in, w->out) != 0) if (buffer_poll(*pfd, w->in, w->out) != 0)
server_lost_window(w); server_lost_window(w);
else else
@ -432,7 +428,6 @@ server_fill_clients(struct pollfd **pfd)
(*pfd)->events = POLLIN; (*pfd)->events = POLLIN;
if (BUFFER_USED(c->out) > 0) if (BUFFER_USED(c->out) > 0)
(*pfd)->events |= POLLOUT; (*pfd)->events |= POLLOUT;
/* log_debug("adding client %d (%d)", (*pfd)->fd, c->fd); */
} }
(*pfd)++; (*pfd)++;
@ -443,7 +438,6 @@ server_fill_clients(struct pollfd **pfd)
(*pfd)->events = POLLIN; (*pfd)->events = POLLIN;
if (BUFFER_USED(c->tty.out) > 0) if (BUFFER_USED(c->tty.out) > 0)
(*pfd)->events |= POLLOUT; (*pfd)->events |= POLLOUT;
/* log_debug("adding tty %d (%d)", (*pfd)->fd, c->tty.fd); */
} }
(*pfd)++; (*pfd)++;
} }
@ -460,7 +454,6 @@ server_handle_clients(struct pollfd **pfd)
c = ARRAY_ITEM(&clients, i); c = ARRAY_ITEM(&clients, i);
if (c != NULL) { if (c != NULL) {
/* log_debug("testing client %d (%d)", (*pfd)->fd, c->fd); */
if (buffer_poll(*pfd, c->in, c->out) != 0) { if (buffer_poll(*pfd, c->in, c->out) != 0) {
server_lost_client(c); server_lost_client(c);
(*pfd) += 2; (*pfd) += 2;
@ -471,7 +464,6 @@ server_handle_clients(struct pollfd **pfd)
(*pfd)++; (*pfd)++;
if (c != NULL && c->tty.fd != -1 && c->session != NULL) { if (c != NULL && c->tty.fd != -1 && c->session != NULL) {
/* log_debug("testing tty %d (%d)", (*pfd)->fd, c->tty.fd); */
if (buffer_poll(*pfd, c->tty.in, c->tty.out) != 0) if (buffer_poll(*pfd, c->tty.in, c->tty.out) != 0)
server_lost_client(c); server_lost_client(c);
else else