summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/tmux/cmd.c8
-rw-r--r--usr.bin/tmux/server-client.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c
index d1f1da30cc2..3be19343e09 100644
--- a/usr.bin/tmux/cmd.c
+++ b/usr.bin/tmux/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.73 2012/12/24 12:38:57 nicm Exp $ */
+/* $OpenBSD: cmd.c,v 1.74 2013/01/18 02:10:29 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -378,14 +378,14 @@ cmd_session_better(struct session *s, struct session *best,
int prefer_unattached)
{
if (best == NULL)
- return 1;
+ return (1);
if (prefer_unattached) {
if (!(best->flags & SESSION_UNATTACHED) &&
(s->flags & SESSION_UNATTACHED))
- return 1;
+ return (1);
else if ((best->flags & SESSION_UNATTACHED) &&
!(s->flags & SESSION_UNATTACHED))
- return 0;
+ return (0);
}
return (timercmp(&s->activity_time, &best->activity_time, >));
}
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index d8eba844d74..877e53d12d8 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.82 2013/01/15 22:55:29 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.83 2013/01/18 02:10:29 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -334,12 +334,12 @@ server_client_assume_paste(struct session *s)
u_int t;
if ((t = options_get_number(&s->options, "assume-paste-time")) == 0)
- return 0;
+ return (0);
timersub(&s->activity_time, &s->last_activity_time, &tv);
if (tv.tv_sec == 0 && tv.tv_usec < t * 1000)
- return 1;
- return 0;
+ return (1);
+ return (0);
}
/* Handle data key input from client. */