diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-02-16 23:02:07 +0000 |
| commit | b3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (patch) | |
| tree | 8704cc16b1ed5380bcd7c678351d85adfd5907c8 /server-fn.c | |
| parent | 8edbbb98656a76f0a25b5243b526709a67ae3531 (diff) | |
| parent | 81db6bab91309e7cb42628048408c10504522a48 (diff) | |
Merge branch 'obsd-master'
Conflicts:
tmux.1
tmux.c
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server-fn.c b/server-fn.c index 4fc4eb5c..a00cadbd 100644 --- a/server-fn.c +++ b/server-fn.c @@ -454,7 +454,7 @@ server_destroy_session(struct session *s) } void -server_check_unattached (void) +server_check_unattached(void) { struct session *s; @@ -480,7 +480,7 @@ server_set_identify(struct client *c) tv.tv_sec = delay / 1000; tv.tv_usec = (delay % 1000) * 1000L; - if (event_initialized (&c->identify_timer)) + if (event_initialized(&c->identify_timer)) evtimer_del(&c->identify_timer); evtimer_set(&c->identify_timer, server_callback_identify, c); evtimer_add(&c->identify_timer, &tv); @@ -592,7 +592,7 @@ server_set_stdin_callback(struct client *c, void (*cb)(struct client *, int, c->references++; if (c->stdin_closed) - c->stdin_callback (c, 1, c->stdin_callback_data); + c->stdin_callback(c, 1, c->stdin_callback_data); server_write_client(c, MSG_STDIN, NULL, 0); |