The branch, master has been updated
via c2e2107063f85c65c0153cb3f201c12e93599038 (commit)
from 3a09e01a8e0e64f02ec054ca098da0bd8bbdf5dd (commit)
- Log -----------------------------------------------------------------
commit c2e2107063f85c65c0153cb3f201c12e93599038
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Style nits - return (x) not return x.
---
cmd.c | 6 +++---
server-client.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmd.c b/cmd.c
index c0888a2..b1b86ea 100644
--- a/cmd.c
+++ b/cmd.c
@@ -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/server-client.c b/server-client.c
index a8d48c5..b24b68e 100644
--- a/server-client.c
+++ b/server-client.c
@@ -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. */
-----------------------------------------------------------------------
Summary of changes:
cmd.c | 6 +++---
server-client.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
