diff options
| -rw-r--r-- | usr.bin/tmux/server-client.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/status.c | 12 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 17 |
3 files changed, 3 insertions, 30 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 2463c696534..696ee2ffe1f 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.146 2015/07/17 06:53:47 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.147 2015/07/29 11:56:02 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -115,8 +115,6 @@ server_client_create(int fd) c->tty.sy = 24; screen_init(&c->status, c->tty.sx, 1, 0); - RB_INIT(&c->status_new); - RB_INIT(&c->status_old); c->message_string = NULL; TAILQ_INIT(&c->message_log); diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 8234fe42ba0..c0279df3bd6 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: status.c,v 1.131 2015/07/28 15:18:10 nicm Exp $ */ +/* $OpenBSD: status.c,v 1.132 2015/07/29 11:56:02 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -142,16 +142,6 @@ status_prompt_save_history(void) } -/* Status output tree. */ -RB_GENERATE(status_out_tree, status_out, entry, status_out_cmp); - -/* Output tree comparison function. */ -int -status_out_cmp(struct status_out *so1, struct status_out *so2) -{ - return (strcmp(so1->cmd, so2->cmd)); -} - /* Get screen line of status line. -1 means off. */ int status_at_line(struct client *c) diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index a21574f31ab..355f27c0e5d 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.530 2015/07/28 15:18:10 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.531 2015/07/29 11:56:02 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1176,15 +1176,6 @@ struct message_entry { TAILQ_ENTRY(message_entry) entry; }; -/* Status output data from a job. */ -struct status_out { - char *cmd; - char *out; - - RB_ENTRY(status_out) entry; -}; -RB_HEAD(status_out_tree, status_out); - /* Client connection. */ struct client { struct imsgbuf ibuf; @@ -1215,8 +1206,6 @@ struct client { struct event repeat_timer; - struct status_out_tree status_old; - struct status_out_tree status_new; struct timeval status_timer; struct screen status; @@ -1904,11 +1893,7 @@ int server_set_stdin_callback(struct client *, void (*)(struct client *, void server_unzoom_window(struct window *); /* status.c */ -int status_out_cmp(struct status_out *, struct status_out *); -RB_PROTOTYPE(status_out_tree, status_out, entry, status_out_cmp); int status_at_line(struct client *); -void status_free_jobs(struct status_out_tree *); -void status_update_jobs(struct client *); struct window *status_get_window_at(struct client *, u_int); int status_redraw(struct client *); void printflike(2, 3) status_message_set(struct client *, const char *, ...); |