Merge branch 'obsd-master'

3 files changed, 0 insertions, 27 deletions

diff --git a/server-client.c b/server-client.c
index 91dd9daf..ad66a3fe 100644
--- a/server-client.c
+++ b/server-client.c
@@ -114,8 +114,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/status.c b/status.c
index 16f4fa70..d9501f02 100644
--- a/status.c
+++ b/status.c
@@ -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/tmux.h b/tmux.h
index 7ff2bb5e..b9a663c5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1180,15 +1180,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;
@@ -1219,8 +1210,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;
 
@@ -1908,11 +1897,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 *, ...);