From 84392ffc0d9aaa81ef213e2c32af5f25d728043e Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 23 Oct 2009 17:32:26 +0000 Subject: Sync OpenBSD patchset 433: Client tidying: get rid of client_ctx struct in favour of two variables in client.c, and move the functions in client-fn.c into other files. --- tmux.h | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index 1bd25cf5..03414ad7 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.482 2009-10-23 17:27:40 tcunha Exp $ */ +/* $Id: tmux.h,v 1.483 2009-10-23 17:32:26 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1050,19 +1050,6 @@ struct client { }; ARRAY_DECL(clients, struct client *); -/* Client context. */ -struct client_ctx { - struct imsgbuf ibuf; - - enum { - CCTX_DETACH, - CCTX_EXIT, - CCTX_DIED, - CCTX_SHUTDOWN - } exittype; - const char *errstr; -}; - /* Key/command line command. */ struct cmd_ctx { /* @@ -1501,14 +1488,8 @@ void cmd_buffer_free(struct cmd *); size_t cmd_buffer_print(struct cmd *, char *, size_t); /* client.c */ -int client_init(char *, struct client_ctx *, int, int); -int client_main(struct client_ctx *); -int client_msg_dispatch(struct client_ctx *); - -/* client-fn.c */ -void client_write_server(struct client_ctx *, enum msgtype, void *, size_t); -void client_fill_session(struct msg_command_data *); -void client_suspend(void); +struct imsgbuf *client_init(char *, int, int); +__dead void client_main(void); /* key-bindings.c */ extern struct key_bindings key_bindings; -- cgit