summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2017-05-31 17:56:49 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2017-05-31 17:56:49 +0000
commitb6b0addf6ab08f91536d8cb34d0dc8526ecb64f7 (patch)
tree87bc92fbaa4f25813611d5a4b696e998a4c3bcd3
parentf21e94de18ebc6087a0451356da10a69ee07520d (diff)
Style and spacing nits.
-rw-r--r--usr.bin/tmux/cmd-set-option.c4
-rw-r--r--usr.bin/tmux/format.c4
-rw-r--r--usr.bin/tmux/job.c4
-rw-r--r--usr.bin/tmux/options.c4
-rw-r--r--usr.bin/tmux/screen-write.c4
-rw-r--r--usr.bin/tmux/utf8.c5
-rw-r--r--usr.bin/tmux/window-buffer.c4
7 files changed, 14 insertions, 15 deletions
diff --git a/usr.bin/tmux/cmd-set-option.c b/usr.bin/tmux/cmd-set-option.c
index 79905594244..40aeb8e2605 100644
--- a/usr.bin/tmux/cmd-set-option.c
+++ b/usr.bin/tmux/cmd-set-option.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-option.c,v 1.115 2017/05/10 13:05:41 nicm Exp $ */
+/* $OpenBSD: cmd-set-option.c,v 1.116 2017/05/31 17:56:48 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -254,7 +254,7 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
RB_FOREACH(w, windows, &windows)
layout_fix_panes(w, w->sx, w->sy);
}
- RB_FOREACH (s, sessions, &sessions)
+ RB_FOREACH(s, sessions, &sessions)
status_update_saved(s);
/*
diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c
index 0853b9f8d99..32abfb54a64 100644
--- a/usr.bin/tmux/format.c
+++ b/usr.bin/tmux/format.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.141 2017/05/30 21:44:59 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.142 2017/05/31 17:56:48 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -203,7 +203,7 @@ format_job_update(struct job *job)
log_debug("%s: %p %s: %s", __func__, fj, fj->cmd, fj->out);
- t = time (NULL);
+ t = time(NULL);
if (fj->status && fj->last != t) {
if (fj->client != NULL)
server_status_client(fj->client);
diff --git a/usr.bin/tmux/job.c b/usr.bin/tmux/job.c
index 74b11f0153f..7d2432b316f 100644
--- a/usr.bin/tmux/job.c
+++ b/usr.bin/tmux/job.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.44 2017/04/25 15:35:10 nicm Exp $ */
+/* $OpenBSD: job.c,v 1.45 2017/05/31 17:56:48 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -158,7 +158,7 @@ job_read_callback(__unused struct bufferevent *bufev, void *data)
struct job *job = data;
if (job->updatecb != NULL)
- job->updatecb (job);
+ job->updatecb(job);
}
/*
diff --git a/usr.bin/tmux/options.c b/usr.bin/tmux/options.c
index 42722f972d0..729e032e0ae 100644
--- a/usr.bin/tmux/options.c
+++ b/usr.bin/tmux/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.34 2017/04/22 06:13:30 nicm Exp $ */
+/* $OpenBSD: options.c,v 1.35 2017/05/31 17:56:48 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -114,7 +114,7 @@ options_free(struct options *oo)
{
struct options_entry *o, *tmp;
- RB_FOREACH_SAFE (o, options_tree, &oo->tree, tmp)
+ RB_FOREACH_SAFE(o, options_tree, &oo->tree, tmp)
options_remove(o);
free(oo);
}
diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c
index 63f9985a5f3..c17bd959d9b 100644
--- a/usr.bin/tmux/screen-write.c
+++ b/usr.bin/tmux/screen-write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: screen-write.c,v 1.125 2017/05/30 21:44:59 nicm Exp $ */
+/* $OpenBSD: screen-write.c,v 1.126 2017/05/31 17:56:48 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -48,7 +48,7 @@ struct screen_write_collect_item {
struct grid_cell gc;
- TAILQ_ENTRY (screen_write_collect_item) entry;
+ TAILQ_ENTRY(screen_write_collect_item) entry;
};
struct screen_write_collect_line {
TAILQ_HEAD(, screen_write_collect_item) items;
diff --git a/usr.bin/tmux/utf8.c b/usr.bin/tmux/utf8.c
index d00f4b3ec11..7e07c64c4b8 100644
--- a/usr.bin/tmux/utf8.c
+++ b/usr.bin/tmux/utf8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utf8.c,v 1.36 2017/03/17 14:51:41 nicm Exp $ */
+/* $OpenBSD: utf8.c,v 1.37 2017/05/31 17:56:48 nicm Exp $ */
/*
* Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -402,8 +402,7 @@ utf8_rtrimcstr(const char *s, u_int width)
next = end - 1;
at = 0;
- for (;;)
- {
+ for (;;) {
if (at + next->width > width) {
next++;
break;
diff --git a/usr.bin/tmux/window-buffer.c b/usr.bin/tmux/window-buffer.c
index 66355d84cc8..0782227cc96 100644
--- a/usr.bin/tmux/window-buffer.c
+++ b/usr.bin/tmux/window-buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-buffer.c,v 1.2 2017/05/31 15:26:41 nicm Exp $ */
+/* $OpenBSD: window-buffer.c,v 1.3 2017/05/31 17:56:48 nicm Exp $ */
/*
* Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -199,7 +199,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata, u_int sx, u_int sy)
screen_write_start(&ctx, NULL, &s);
screen_write_clearscreen(&ctx, 8);
- pdata = end = paste_buffer_data (pb, &psize);
+ pdata = end = paste_buffer_data(pb, &psize);
for (i = 0; i < sy; i++) {
at = 0;
while (end != pdata + psize && *end != '\n') {