From 99df48d70f10dcf8f95d4684262a3392d72ee9c6 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 18 Jun 2008 22:21:51 +0000 Subject: [PATCH] Trimify. --- arg.c | 16 ++++++++-------- buffer-poll.c | 4 ++-- cmd-attach-session.c | 4 ++-- cmd-copy-mode.c | 4 ++-- cmd-generic.c | 10 +++++----- cmd-last-window.c | 6 +++--- cmd-link-window.c | 6 +++--- cmd-refresh-client.c | 4 ++-- cmd-rename-session.c | 4 ++-- cmd-set-option.c | 4 ++-- cmd-set-window-option.c | 10 +++++----- cmd-show-options.c | 4 ++-- cmd-switch-client.c | 4 ++-- cmd.c | 8 ++++---- compat/asprintf.c | 4 ++-- compat/forkpty-sunos.c | 10 +++++----- input-keys.c | 4 ++-- screen-display.c | 4 ++-- screen.c | 6 +++--- server-msg.c | 4 ++-- server.c | 22 +++++++++++----------- session.c | 4 ++-- status.c | 18 +++++++++--------- tmux.c | 8 ++++---- tty.c | 8 ++++---- window-copy.c | 4 ++-- window-more.c | 4 ++-- window.c | 6 +++--- 28 files changed, 97 insertions(+), 97 deletions(-) diff --git a/arg.c b/arg.c index 00b314d4..9ba299c9 100644 --- a/arg.c +++ b/arg.c @@ -1,4 +1,4 @@ -/* $Id: arg.c,v 1.2 2008-06-05 21:54:47 nicm Exp $ */ +/* $Id: arg.c,v 1.3 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -51,7 +51,7 @@ arg_lookup_session(const char *name) ts = NULL; for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { - s = ARRAY_ITEM(&sessions, i); + s = ARRAY_ITEM(&sessions, i); if (s == NULL || fnmatch(name, s->name, 0) != 0) continue; @@ -133,7 +133,7 @@ arg_parse_window(const char *arg, struct session **s, int *idx) *s = arg_parse_session(NULL); return (0); } - + /* Find the separator if any. */ arg2 = xstrdup(arg); ptr = strrchr(arg2, ':'); @@ -147,7 +147,7 @@ arg_parse_window(const char *arg, struct session **s, int *idx) if (errstr != NULL) { xfree(arg2); return (1); - } + } xfree(arg2); *s = arg_parse_session(NULL); @@ -162,25 +162,25 @@ arg_parse_window(const char *arg, struct session **s, int *idx) xfree(arg2); *s = arg_parse_session(NULL); return (0); - } + } *idx = -1; goto lookup; - } + } /* If last, strip it and look up as a session. */ if (ptr[1] == '\0') { *ptr = '\0'; goto lookup; } - + /* Present but not first and not last. Break and convert both. */ *ptr = '\0'; *idx = strtonum(ptr + 1, 0, INT_MAX, &errstr); if (errstr != NULL) { xfree(arg2); return (1); - } + } lookup: /* Look up as session. */ diff --git a/buffer-poll.c b/buffer-poll.c index 37a6b4c0..25394575 100644 --- a/buffer-poll.c +++ b/buffer-poll.c @@ -1,4 +1,4 @@ -/* $Id: buffer-poll.c,v 1.6 2008-06-18 20:11:25 nicm Exp $ */ +/* $Id: buffer-poll.c,v 1.7 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -60,7 +60,7 @@ buffer_poll(struct pollfd *pfd, struct buffer *in, struct buffer *out) buffer_add(in, n); } if (BUFFER_USED(out) > 0 && pfd->revents & POLLOUT) { - n = write(pfd->fd, BUFFER_OUT(out), BUFFER_USED(out)); + n = write(pfd->fd, BUFFER_OUT(out), BUFFER_USED(out)); log_debug("buffer_poll: fd=%d, write=%zd", pfd->fd, n); if (n == -1) { if (errno != EINTR && errno != EAGAIN) diff --git a/cmd-attach-session.c b/cmd-attach-session.c index 27e965bb..3d82a243 100644 --- a/cmd-attach-session.c +++ b/cmd-attach-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-attach-session.c,v 1.18 2008-06-05 21:25:00 nicm Exp $ */ +/* $Id: cmd-attach-session.c,v 1.19 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -50,7 +50,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx) if (ctx->flags & CMD_KEY) return; - + if ((s = cmd_find_session(ctx, data->target)) == NULL) return; diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index 530ee947..0746b3fd 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -1,4 +1,4 @@ -/* $Id: cmd-copy-mode.c,v 1.10 2008-06-05 21:25:00 nicm Exp $ */ +/* $Id: cmd-copy-mode.c,v 1.11 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -27,7 +27,7 @@ void cmd_copy_mode_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_copy_mode_entry = { - "copy-mode", NULL, + "copy-mode", NULL, CMD_TARGET_WINDOW_USAGE, 0, cmd_target_init, diff --git a/cmd-generic.c b/cmd-generic.c index c5494657..68805d62 100644 --- a/cmd-generic.c +++ b/cmd-generic.c @@ -1,4 +1,4 @@ -/* $Id: cmd-generic.c,v 1.9 2008-06-05 23:17:03 nicm Exp $ */ +/* $Id: cmd-generic.c,v 1.10 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -43,7 +43,7 @@ cmd_target_parse(struct cmd *self, int argc, char **argv, char **cause) /* Don't use the entry version since it may be dependent on key. */ cmd_target_init(self, 0); data = self->data; - + while ((opt = getopt(argc, argv, "dkt:")) != EOF) { switch (opt) { case 'd': @@ -124,7 +124,7 @@ cmd_target_print(struct cmd *self, char *buf, size_t len) { struct cmd_target_data *data = self->data; size_t off = 0; - + off += xsnprintf(buf, len, "%s", self->entry->name); if (data == NULL) return; @@ -155,7 +155,7 @@ cmd_srcdst_parse(struct cmd *self, int argc, char **argv, char **cause) { struct cmd_srcdst_data *data; int opt; - + cmd_srcdst_init(self, 0); data = self->data; @@ -247,7 +247,7 @@ cmd_srcdst_print(struct cmd *self, char *buf, size_t len) { struct cmd_srcdst_data *data = self->data; size_t off = 0; - + off += xsnprintf(buf, len, "%s", self->entry->name); if (data == NULL) return; diff --git a/cmd-last-window.c b/cmd-last-window.c index 20a7abe9..0bff8d21 100644 --- a/cmd-last-window.c +++ b/cmd-last-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-last-window.c,v 1.12 2008-06-06 20:02:27 nicm Exp $ */ +/* $Id: cmd-last-window.c,v 1.13 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -27,7 +27,7 @@ void cmd_last_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_last_window_entry = { - "last-window", "last", + "last-window", "last", CMD_TARGET_SESSION_USAGE, 0, cmd_target_init, @@ -44,7 +44,7 @@ cmd_last_window_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct session *s; - + if ((s = cmd_find_session(ctx, data->target)) == NULL) return; diff --git a/cmd-link-window.c b/cmd-link-window.c index 19111c1e..3a3c3e5e 100644 --- a/cmd-link-window.c +++ b/cmd-link-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-link-window.c,v 1.22 2008-06-06 20:02:27 nicm Exp $ */ +/* $Id: cmd-link-window.c,v 1.23 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -80,7 +80,7 @@ cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx) */ session_alert_cancel(s, wl_dst); winlink_remove(&s->windows, wl_dst); - + /* Force select/redraw if current. */ if (wl_dst == s->curw) { data->flags &= ~CMD_DFLAG; @@ -88,7 +88,7 @@ cmd_link_window_exec(struct cmd *self, struct cmd_ctx *ctx) } if (wl_dst == s->lastw) s->lastw = NULL; - + /* * Can't error out after this or there could be an * empty session! diff --git a/cmd-refresh-client.c b/cmd-refresh-client.c index 51896ec7..9c413aa0 100644 --- a/cmd-refresh-client.c +++ b/cmd-refresh-client.c @@ -1,4 +1,4 @@ -/* $Id: cmd-refresh-client.c,v 1.6 2008-06-05 21:25:00 nicm Exp $ */ +/* $Id: cmd-refresh-client.c,v 1.7 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -47,7 +47,7 @@ cmd_refresh_client_exec(struct cmd *self, struct cmd_ctx *ctx) if ((c = cmd_find_client(ctx, data->target)) == NULL) return; - + server_redraw_client(c); if (ctx->cmdclient != NULL) diff --git a/cmd-rename-session.c b/cmd-rename-session.c index ab0f0469..c9c3d302 100644 --- a/cmd-rename-session.c +++ b/cmd-rename-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-rename-session.c,v 1.11 2008-06-05 21:25:00 nicm Exp $ */ +/* $Id: cmd-rename-session.c,v 1.12 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -32,7 +32,7 @@ void cmd_rename_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_rename_session_entry = { "rename-session", "rename", CMD_TARGET_SESSION_USAGE " new-name", - CMD_ONEARG, + CMD_ONEARG, cmd_target_init, cmd_target_parse, cmd_rename_session_exec, diff --git a/cmd-set-option.c b/cmd-set-option.c index 36e8fffd..ec4476f7 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -1,4 +1,4 @@ -/* $Id: cmd-set-option.c,v 1.30 2008-06-18 20:11:25 nicm Exp $ */ +/* $Id: cmd-set-option.c,v 1.31 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -338,5 +338,5 @@ cmd_set_option_print(struct cmd *self, char *buf, size_t len) if (off < len && data->option != NULL) off += xsnprintf(buf + off, len - off, " %s", data->option); if (off < len && data->value != NULL) - off += xsnprintf(buf + off, len - off, " %s", data->value); + off += xsnprintf(buf + off, len - off, " %s", data->value); } diff --git a/cmd-set-window-option.c b/cmd-set-window-option.c index 0565d892..ec3f0582 100644 --- a/cmd-set-window-option.c +++ b/cmd-set-window-option.c @@ -1,4 +1,4 @@ -/* $Id: cmd-set-window-option.c,v 1.9 2008-06-18 20:11:25 nicm Exp $ */ +/* $Id: cmd-set-window-option.c,v 1.10 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -141,7 +141,7 @@ cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx) else { if (flag) wl->window->flags |= WINDOW_MONITOR; - else + else wl->window->flags &= ~WINDOW_MONITOR; } @@ -154,7 +154,7 @@ cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx) } for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { - s = ARRAY_ITEM(&sessions, i); + s = ARRAY_ITEM(&sessions, i); if (s != NULL) session_alert_cancel(s, wl); } @@ -169,7 +169,7 @@ cmd_set_window_option_exec(struct cmd *self, struct cmd_ctx *ctx) else { if (flag) wl->window->flags |= WINDOW_AGGRESSIVE; - else + else wl->window->flags &= ~WINDOW_AGGRESSIVE; } @@ -278,5 +278,5 @@ cmd_set_window_option_print(struct cmd *self, char *buf, size_t len) if (off < len && data->option != NULL) off += xsnprintf(buf + off, len - off, " %s", data->option); if (off < len && data->value != NULL) - off += xsnprintf(buf + off, len - off, " %s", data->value); + off += xsnprintf(buf + off, len - off, " %s", data->value); } diff --git a/cmd-show-options.c b/cmd-show-options.c index 7a4a5095..439730f2 100644 --- a/cmd-show-options.c +++ b/cmd-show-options.c @@ -1,4 +1,4 @@ -/* $Id: cmd-show-options.c,v 1.2 2008-06-16 06:33:50 nicm Exp $ */ +/* $Id: cmd-show-options.c,v 1.3 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -119,7 +119,7 @@ cmd_show_options_exec(struct cmd *self, struct cmd_ctx *ctx) ctx->print(ctx, "%s %lld", o->name, o->value.number); break; case OPTIONS_KEY: - ctx->print(ctx, "%s %s", o->name, + ctx->print(ctx, "%s %s", o->name, key_string_lookup_key(o->value.key)); break; case OPTIONS_COLOURS: diff --git a/cmd-switch-client.c b/cmd-switch-client.c index e8e5b93f..d7e14b76 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -1,4 +1,4 @@ -/* $Id: cmd-switch-client.c,v 1.9 2008-06-05 21:25:00 nicm Exp $ */ +/* $Id: cmd-switch-client.c,v 1.10 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -103,7 +103,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_ctx *ctx) return; if ((s = cmd_find_session(ctx, data->target)) == NULL) return; - + c->session = s; recalculate_sizes(); diff --git a/cmd.c b/cmd.c index 2e83e30e..26fc5ce8 100644 --- a/cmd.c +++ b/cmd.c @@ -1,4 +1,4 @@ -/* $Id: cmd.c,v 1.48 2008-06-16 22:03:27 nicm Exp $ */ +/* $Id: cmd.c,v 1.49 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -262,10 +262,10 @@ cmd_current_session(struct cmd_ctx *ctx) } return (s); } - + ts = NULL; for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { - s = ARRAY_ITEM(&sessions, i); + s = ARRAY_ITEM(&sessions, i); if (s != NULL && (ts == NULL || timespeccmp(&s->ts, ts, >))) { newest = ARRAY_ITEM(&sessions, i); ts = &s->ts; @@ -278,7 +278,7 @@ struct client * cmd_find_client(struct cmd_ctx *ctx, const char *arg) { struct client *c; - + if ((c = arg_parse_client(arg)) == NULL) c = ctx->curclient; if (c == NULL) { diff --git a/compat/asprintf.c b/compat/asprintf.c index 1f157046..f3ec7ef7 100644 --- a/compat/asprintf.c +++ b/compat/asprintf.c @@ -1,4 +1,4 @@ -/* $Id: asprintf.c,v 1.1 2008-06-18 20:12:19 nicm Exp $ */ +/* $Id: asprintf.c,v 1.2 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2006 Nicholas Marriott @@ -47,7 +47,7 @@ vasprintf(char **ret, const char *format, va_list ap) xfree(*ret); goto error; } - + return (n); error: diff --git a/compat/forkpty-sunos.c b/compat/forkpty-sunos.c index 51070f75..bc4fe8a3 100644 --- a/compat/forkpty-sunos.c +++ b/compat/forkpty-sunos.c @@ -1,4 +1,4 @@ -/* $Id: forkpty-sunos.c,v 1.4 2008-06-18 22:00:49 nicm Exp $ */ +/* $Id: forkpty-sunos.c,v 1.5 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -39,12 +39,12 @@ forkpty(int *master, goto out; if (unlockpt(*master) != 0) goto out; - + if ((path = ptsname(*master)) == NULL) goto out; if ((slave = open(path, O_RDWR|O_NOCTTY)) == -1) goto out; - + switch (pid = fork()) { case -1: goto out; @@ -59,10 +59,10 @@ forkpty(int *master, fatal("ioctl failed"); if (ioctl(slave, I_PUSH, "ldterm") == -1) fatal("ioctl failed"); - + if (ioctl(slave, TIOCSWINSZ, ws) == -1) fatal("ioctl failed"); - + dup2(slave, 0); dup2(slave, 1); dup2(slave, 2); diff --git a/input-keys.c b/input-keys.c index 51920578..d1259d13 100644 --- a/input-keys.c +++ b/input-keys.c @@ -1,4 +1,4 @@ -/* $Id: input-keys.c,v 1.7 2008-06-06 17:20:29 nicm Exp $ */ +/* $Id: input-keys.c,v 1.8 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -108,7 +108,7 @@ input_key(struct window *w, int key) } } #endif - + for (i = 0; i < NINPUTKEYS; i++) { if (input_keys[i].key == key) break; diff --git a/screen-display.c b/screen-display.c index 73995cda..fce01d91 100644 --- a/screen-display.c +++ b/screen-display.c @@ -1,4 +1,4 @@ -/* $Id: screen-display.c,v 1.16 2008-06-04 19:20:09 nicm Exp $ */ +/* $Id: screen-display.c,v 1.17 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -439,7 +439,7 @@ screen_display_copy_area(struct screen *dst, struct screen *src, } if (!screen_in_x(dst, px) || !screen_in_y(dst, py)) { SCREEN_DEBUG4(dst, px, py, nx, ny); - return; + return; } if (!screen_in_x(dst, px + nx - 1) || !screen_in_y(dst, py + ny - 1)) { SCREEN_DEBUG4(dst, px, py, nx, ny); diff --git a/screen.c b/screen.c index 51b8fa2d..825803a7 100644 --- a/screen.c +++ b/screen.c @@ -1,4 +1,4 @@ -/* $Id: screen.c,v 1.61 2008-06-14 12:05:06 nicm Exp $ */ +/* $Id: screen.c,v 1.62 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -45,7 +45,7 @@ * ----------- array base + hsize + dy * * The screen_x/screen_y macros are used to convert a cell on the displayed - * area to an absolute position in the arrays. + * area to an absolute position in the arrays. * * Screen handling code is split into four files: * @@ -54,7 +54,7 @@ * screen-display.c: Basic functions for manipulating the displayed * part of the screen. x,y coordinates passed to these * are relative to the display. These are largely - * utility functions for screen-write.c. + * utility functions for screen-write.c. * screen-redraw.c: Functions for redrawing all or part of a screen to * one or more ttys. A context is filled via one of the * screen_redraw_start* variants which sets up (removes diff --git a/server-msg.c b/server-msg.c index 4b1ff441..1419a85f 100644 --- a/server-msg.c +++ b/server-msg.c @@ -1,4 +1,4 @@ -/* $Id: server-msg.c,v 1.46 2008-06-16 17:35:40 nicm Exp $ */ +/* $Id: server-msg.c,v 1.47 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -222,7 +222,7 @@ server_msg_fn_exiting(struct hdr *hdr, struct client *c) log_debug("exiting msg from client"); c->session = NULL; - + tty_close(&c->tty); server_write_client(c, MSG_EXITED, NULL, 0); diff --git a/server.c b/server.c index fbb07a04..3b63b69b 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.67 2008-06-18 19:34:50 nicm Exp $ */ +/* $Id: server.c,v 1.68 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -97,7 +97,7 @@ server_start(const char *path) xmalloc_clear(); #endif - /* + /* * Must daemonise before loading configuration as the PID changes so * $TMUX would be wrong for sessions created in the config file. */ @@ -169,7 +169,7 @@ server_main(const char *srv_path, int srv_fd) u_int i, n; siginit(); - + pfds = NULL; while (!sigterm) { /* Initialise pollfd array. */ @@ -308,10 +308,10 @@ server_check_redraw(struct client *c) if (c == NULL || c->session == NULL) return; s = c->session; - + if (options_get_number(&s->options, "set-titles")) { - xsnprintf(title, sizeof title, - "%s:%u:%s - \"%s\"", s->name, s->curw->idx, + xsnprintf(title, sizeof title, + "%s:%u:%s - \"%s\"", s->name, s->curw->idx, s->curw->window->name, s->curw->window->base.title); if (c->title == NULL || strcmp(title, c->title) != 0) { if (c->title != NULL) @@ -328,7 +328,7 @@ server_check_redraw(struct client *c) sy = screen_size_y(s->curw->window->screen); if (sx < xx || sy < yy) { /* - * Fake up a blank(ish) screen and use it to draw the + * Fake up a blank(ish) screen and use it to draw the * empty regions. NOTE: because this uses * tty_write_client but doesn't write the client's * screen, this can't use anything which relies on @@ -339,7 +339,7 @@ server_check_redraw(struct client *c) if (sx < xx) screen_redraw_columns(&ctx, sx, xx - sx); if (sy < yy) { - screen_fill_area(&screen, + screen_fill_area(&screen, 0, sy, xx, 1, '-', 0, 0x70); screen_redraw_lines(&ctx, sy, yy - sy); } @@ -372,11 +372,11 @@ server_check_status(struct client *c) interval = options_get_number(&c->session->options, "status-interval"); if (nlines == 0 || interval == 0) return; - + if (clock_gettime(CLOCK_REALTIME, &ts) != 0) fatal("clock_gettime"); ts.tv_sec -= interval; - + if (timespeccmp(&c->status_ts, &ts, <)) c->flags |= CLIENT_STATUS; } @@ -428,7 +428,7 @@ server_handle_clients(struct pollfd **pfd) for (i = 0; i < ARRAY_LENGTH(&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) { server_lost_client(c); diff --git a/session.c b/session.c index 9ee9941e..75a01c76 100644 --- a/session.c +++ b/session.c @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.37 2008-06-07 07:27:28 nicm Exp $ */ +/* $Id: session.c,v 1.38 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -121,7 +121,7 @@ session_create(const char *name, const char *cmd, u_int sx, u_int sy) RB_INIT(&s->windows); TAILQ_INIT(&s->alerts); options_init(&s->options, &global_options); - + s->sx = sx; s->sy = sy; diff --git a/status.c b/status.c index 2e2069dc..a9dbfb5e 100644 --- a/status.c +++ b/status.c @@ -1,4 +1,4 @@ -/* $Id: status.c,v 1.29 2008-06-18 17:28:17 nicm Exp $ */ +/* $Id: status.c,v 1.30 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -47,7 +47,7 @@ status_redraw(struct client *c) larrow = rarrow = 0; if (clock_gettime(CLOCK_REALTIME, &c->status_ts) != 0) - fatal("clock_gettime failed"); + fatal("clock_gettime failed"); colr = options_get_colours(&s->options, "status-colour"); yy = c->sy - yy; @@ -74,7 +74,7 @@ status_redraw(struct client *c) goto blank; xx = c->sx - xx; - /* + /* * Right. We have xx characters to fill. Find out how much is to go in * them and the offset of the current window (it must be on screen). */ @@ -125,7 +125,7 @@ status_redraw(struct client *c) xx--; } width = xx; - + draw: /* Bail here if anything is too small too. XXX. */ if (width == 0 || xx == 0) @@ -159,7 +159,7 @@ draw: larrow = -1; } - for (ptr = text; *ptr != '\0'; ptr++) { + for (ptr = text; *ptr != '\0'; ptr++) { if (offset >= start && offset < start + width) ctx.write(ctx.data, TTY_CHARACTER, *ptr); offset++; @@ -205,7 +205,7 @@ draw: else screen_redraw_move_cursor(&ctx, 0, yy); ctx.write(ctx.data, TTY_CHARACTER, '<'); - } + } if (rarrow != 0) { if (rarrow == -1) screen_redraw_set_attributes(&ctx, ATTR_REVERSE, colr); @@ -218,7 +218,7 @@ draw: ctx.write(ctx.data, TTY_CHARACTER, '>'); } - screen_redraw_stop(&ctx); + screen_redraw_stop(&ctx); return; blank: @@ -226,9 +226,9 @@ blank: screen_redraw_start_client(&ctx, c); screen_redraw_set_attributes(&ctx, 0, colr); screen_redraw_move_cursor(&ctx, 0, yy); - for (offset = 0; offset < c->sx; offset++) + for (offset = 0; offset < c->sx; offset++) ctx.write(ctx.data, TTY_CHARACTER, ' '); - screen_redraw_stop(&ctx); + screen_redraw_stop(&ctx); } size_t diff --git a/tmux.c b/tmux.c index 63e0d415..07a150da 100644 --- a/tmux.c +++ b/tmux.c @@ -1,4 +1,4 @@ -/* $Id: tmux.c,v 1.60 2008-06-18 20:11:25 nicm Exp $ */ +/* $Id: tmux.c,v 1.61 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -58,12 +58,12 @@ __dead void usage(void); #ifdef NO_PROGNAME const char *__progname = "tmux"; -#endif +#endif __dead void usage(void) { - fprintf(stderr, + fprintf(stderr, "usage: %s [-v] [-f file] [-S socket-path] [command [flags]]\n", __progname); exit(1); @@ -240,7 +240,7 @@ main(int argc, char **argv) if (access(cfg_file, R_OK) != 0) { log_warn("%s", cfg_file); exit(1); - } + } } if (path == NULL) { diff --git a/tty.c b/tty.c index 1108f117..424951f3 100644 --- a/tty.c +++ b/tty.c @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.27 2008-06-18 22:18:08 nicm Exp $ */ +/* $Id: tty.c,v 1.28 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -90,7 +90,7 @@ tty_open(struct tty *tty, char **cause) tio.c_iflag |= IGNBRK; tio.c_oflag &= ~(OPOST|ONLCR|OCRNL|ONLRET|OLCUC); tio.c_lflag &= ~(IEXTEN|ICANON|ECHO|ECHOE|ECHONL|ECHOCTL|ECHOPRT|ECHOKE|ECHOCTL|ISIG); - tio.c_cc[VMIN] = 1; + tio.c_cc[VMIN] = 1; tio.c_cc[VTIME] = 0; if (tcsetattr(tty->fd, TCSANOW, &tio) != 0) fatal("tcsetattr failed"); @@ -136,7 +136,7 @@ tty_close(struct tty *tty) } else { if (tcsetattr(tty->fd, TCSANOW, &tty->tio) != 0) fatal("tcsetattr failed"); - + tty_raw(tty, tparm(change_scroll_region, 0, ws.ws_row - 1)); if (keypad_local != NULL) tty_raw(tty, keypad_local); @@ -175,7 +175,7 @@ tty_find_term(char *name, int fd, char **cause) { struct tty_term *term; int error; - + TAILQ_FOREACH(term, &tty_terms, entry) { if (strcmp(term->name, name) == 0) { term->references++; diff --git a/window-copy.c b/window-copy.c index ddfa9239..8cf3e053 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.17 2008-06-04 18:50:35 nicm Exp $ */ +/* $Id: window-copy.c,v 1.18 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -71,7 +71,7 @@ struct window_copy_mode_data { u_int selx; u_int sely; - + u_int cx; u_int cy; }; diff --git a/window-more.c b/window-more.c index fbb5b999..d277883b 100644 --- a/window-more.c +++ b/window-more.c @@ -1,4 +1,4 @@ -/* $Id: window-more.c,v 1.11 2008-06-03 21:42:37 nicm Exp $ */ +/* $Id: window-more.c,v 1.12 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -94,7 +94,7 @@ window_more_init(struct window *w) s = &data->screen; screen_create(s, screen_size_x(&w->base), screen_size_y(&w->base), 0); s->mode &= ~MODE_CURSOR; - + return (s); } diff --git a/window.c b/window.c index 2b1ab572..1fb63708 100644 --- a/window.c +++ b/window.c @@ -1,4 +1,4 @@ -/* $Id: window.c,v 1.43 2008-06-18 20:11:25 nicm Exp $ */ +/* $Id: window.c,v 1.44 2008-06-18 22:21:51 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -165,7 +165,7 @@ winlink_previous(unused struct winlinks *wwl, struct winlink *wl) } struct window * -window_create(const char *name, +window_create(const char *name, const char *cmd, const char **env, u_int sx, u_int sy, u_int hlimit) { struct window *w; @@ -189,7 +189,7 @@ window_create(const char *name, sigreset(); log_debug("started child: cmd=%s; pid=%d", cmd, (int) getpid()); log_close(); - + execl(_PATH_BSHELL, "sh", "-c", cmd, (char *) NULL); fatal("execl failed"); }