aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2008-09-29 16:03:27 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2008-09-29 16:03:27 +0000
commit9e573367865976152784858003161c01dc80b83b (patch)
treebc9d6dfc54a1b68ffb8a092f91ab9b7aea2f060b
parent631a45ecb580aae181190ed4a2954b15ab3bbeb5 (diff)
downloadrtmux-9e573367865976152784858003161c01dc80b83b.tar.gz
rtmux-9e573367865976152784858003161c01dc80b83b.tar.bz2
rtmux-9e573367865976152784858003161c01dc80b83b.zip
Style tweaks.
-rw-r--r--server.c9
-rw-r--r--tmux.c4
2 files changed, 6 insertions, 7 deletions
diff --git a/server.c b/server.c
index a127b822..2b6c771e 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.82 2008-09-26 06:45:27 nicm Exp $ */
+/* $Id: server.c,v 1.83 2008-09-29 16:03:27 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -380,7 +380,7 @@ void
server_check_timers(struct client *c)
{
struct session *s;
- struct timeval tv, tv2;
+ struct timeval tv;
u_int interval;
if (c == NULL || c->session == NULL)
@@ -399,9 +399,8 @@ server_check_timers(struct client *c)
if (interval == 0)
return;
- memcpy(&tv2, &tv, sizeof tv2);
- tv2.tv_sec -= interval;
- if (timercmp(&c->status_timer, &tv2, <))
+ tv.tv_sec -= interval;
+ if (timercmp(&c->status_timer, &tv, <))
c->flags |= CLIENT_STATUS;
}
diff --git a/tmux.c b/tmux.c
index 73a2a82d..15c1d3b8 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.78 2008-09-26 06:45:28 nicm Exp $ */
+/* $Id: tmux.c,v 1.79 2008-09-29 16:03:27 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -287,7 +287,7 @@ main(int argc, char **argv)
if (argc == 0) {
cmd = xmalloc(sizeof *cmd);
- cmd->entry = &cmd_new_session_entry;
+ cmd->entry = &cmd_new_session_entry;
cmd->entry->init(cmd, 0);
} else if ((cmd = cmd_parse(argc, argv, &cause)) == NULL) {
log_warnx("%s", cause);