summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-09-03 14:30:23 +0000
committernicm <nicm@openbsd.org>2015-09-03 14:30:23 +0000
commit1d75677ebf71bb80421fa88338e24051ffbfd108 (patch)
treedac26a3f6e101d7faed09faf5f21662a0f47b631
parentRemove the abort_task field in struct dwc2_xfer. There is an identical (diff)
downloadwireguard-openbsd-1d75677ebf71bb80421fa88338e24051ffbfd108.tar.xz
wireguard-openbsd-1d75677ebf71bb80421fa88338e24051ffbfd108.zip
A couple of style nits.
-rw-r--r--usr.bin/tmux/format.c5
-rw-r--r--usr.bin/tmux/tmux.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c
index fab5bca4c65..8cc9bd9624e 100644
--- a/usr.bin/tmux/format.c
+++ b/usr.bin/tmux/format.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: format.c,v 1.81 2015/08/29 09:25:00 nicm Exp $ */
+/* $OpenBSD: format.c,v 1.82 2015/09/03 14:30:23 nicm Exp $ */
/*
* Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -218,8 +218,7 @@ format_job_get(struct format_tree *ft, const char *cmd)
struct format_job fj0, *fj;
fj0.cmd = cmd;
- if ((fj = RB_FIND(format_job_tree, &format_jobs, &fj0)) == NULL)
- {
+ if ((fj = RB_FIND(format_job_tree, &format_jobs, &fj0)) == NULL) {
fj = xcalloc(1, sizeof *fj);
fj->cmd = xstrdup(cmd);
fj->status = ft->status;
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 93a1aa06a0c..23237f32dc9 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.142 2015/09/01 10:10:59 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.143 2015/09/03 14:30:23 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -321,8 +321,7 @@ main(int argc, char **argv)
free(path);
label = xstrdup("default");
}
- }
- else
+ } else
label = xstrdup("default");
}