circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Style tweaks.

pull/1/head
Nicholas Marriott 2008-09-29 16:03:27 +00:00
parent 631a45ecb5
commit 9e57336786
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server.c
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -380,7 +380,7 @@ void
server_check_timers(struct client *c) server_check_timers(struct client *c)
{ {
struct session *s; struct session *s;
struct timeval tv, tv2; struct timeval tv;
u_int interval; u_int interval;
if (c == NULL || c->session == NULL) if (c == NULL || c->session == NULL)
@ -399,9 +399,8 @@ server_check_timers(struct client *c)
if (interval == 0) if (interval == 0)
return; return;
memcpy(&tv2, &tv, sizeof tv2); tv.tv_sec -= interval;
tv2.tv_sec -= interval; if (timercmp(&c->status_timer, &tv, <))
if (timercmp(&c->status_timer, &tv2, <))
c->flags |= CLIENT_STATUS; c->flags |= CLIENT_STATUS;
} }

4
tmux.c
View File

@ -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> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -287,7 +287,7 @@ main(int argc, char **argv)
if (argc == 0) { if (argc == 0) {
cmd = xmalloc(sizeof *cmd); cmd = xmalloc(sizeof *cmd);
cmd->entry = &cmd_new_session_entry; cmd->entry = &cmd_new_session_entry;
cmd->entry->init(cmd, 0); cmd->entry->init(cmd, 0);
} else if ((cmd = cmd_parse(argc, argv, &cause)) == NULL) { } else if ((cmd = cmd_parse(argc, argv, &cause)) == NULL) {
log_warnx("%s", cause); log_warnx("%s", cause);