Revision: 2736
http://tmux.svn.sourceforge.net/tmux/?rev=2736&view=rev
Author: tcunha
Date: 2012-03-18 01:59:34 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
Sync OpenBSD patchset 1057:
Check event_initialized before event_del if event may not have been set
up; libevent2 complains about this. Reported by Moriyoshi Koizumi.
Modified Paths:
--------------
trunk/names.c
trunk/server-client.c
trunk/server-fn.c
trunk/status.c
trunk/tty-keys.c
trunk/tty.c
trunk/window.c
Modified: trunk/names.c
===================================================================
--- trunk/names.c 2012-03-18 01:58:09 UTC (rev 2735)
+++ trunk/names.c 2012-03-18 01:59:34 UTC (rev 2736)
@@ -36,7 +36,8 @@
tv.tv_sec = 0;
tv.tv_usec = NAME_INTERVAL * 1000L;
- evtimer_del(&w->name_timer);
+ if (event_initialized(&w->name_timer))
+ evtimer_del(&w->name_timer);
evtimer_set(&w->name_timer, window_name_callback, w);
evtimer_add(&w->name_timer, &tv);
}
Modified: trunk/server-client.c
===================================================================
--- trunk/server-client.c 2012-03-18 01:58:09 UTC (rev 2735)
+++ trunk/server-client.c 2012-03-18 01:59:34 UTC (rev 2736)
@@ -152,11 +152,13 @@
evtimer_del(&c->repeat_timer);
- evtimer_del(&c->identify_timer);
+ if (event_initialized(&c->identify_timer))
+ evtimer_del(&c->identify_timer);
if (c->message_string != NULL)
xfree(c->message_string);
- evtimer_del(&c->message_timer);
+ if (event_initialized (&c->message_timer))
+ evtimer_del(&c->message_timer);
for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
msg = &ARRAY_ITEM(&c->message_log, i);
xfree(msg->msg);
@@ -175,7 +177,8 @@
close(c->ibuf.fd);
imsg_clear(&c->ibuf);
- event_del(&c->event);
+ if (event_initialized(&c->event))
+ event_del(&c->event);
for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
if (ARRAY_ITEM(&dead_clients, i) == NULL) {
Modified: trunk/server-fn.c
===================================================================
--- trunk/server-fn.c 2012-03-18 01:58:09 UTC (rev 2735)
+++ trunk/server-fn.c 2012-03-18 01:59:34 UTC (rev 2736)
@@ -453,7 +453,8 @@
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
- evtimer_del(&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);
@@ -491,7 +492,8 @@
events |= EV_READ;
if (c->ibuf.w.queued > 0)
events |= EV_WRITE;
- event_del(&c->event);
+ if (event_initialized(&c->event))
+ event_del(&c->event);
event_set(&c->event, c->ibuf.fd, events, server_client_callback, c);
event_add(&c->event, NULL);
}
Modified: trunk/status.c
===================================================================
--- trunk/status.c 2012-03-18 01:58:09 UTC (rev 2735)
+++ trunk/status.c 2012-03-18 01:59:34 UTC (rev 2736)
@@ -776,7 +776,8 @@
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
- evtimer_del(&c->message_timer);
+ if (event_initialized (&c->message_timer))
+ evtimer_del(&c->message_timer);
evtimer_set(&c->message_timer, status_message_callback, c);
evtimer_add(&c->message_timer, &tv);
Modified: trunk/tty-keys.c
===================================================================
--- trunk/tty-keys.c 2012-03-18 01:58:09 UTC (rev 2735)
+++ trunk/tty-keys.c 2012-03-18 01:59:34 UTC (rev 2736)
@@ -549,7 +549,8 @@
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
- evtimer_del(&tty->key_timer);
+ if (event_initialized(&tty->key_timer))
+ evtimer_del(&tty->key_timer);
evtimer_set(&tty->key_timer, tty_keys_callback, tty);
evtimer_add(&tty->key_timer, &tv);
@@ -573,7 +574,8 @@
goto handle_key;
handle_key:
- evtimer_del(&tty->key_timer);
+ if (event_initialized(&tty->key_timer))
+ evtimer_del(&tty->key_timer);
if (key != KEYC_NONE)
tty->key_callback(key, &mouse, tty->key_data);
Modified: trunk/tty.c
===================================================================
--- trunk/tty.c 2012-03-18 01:58:09 UTC (rev 2735)
+++ trunk/tty.c 2012-03-18 01:59:34 UTC (rev 2736)
@@ -279,7 +279,8 @@
tty->log_fd = -1;
}
- evtimer_del(&tty->key_timer);
+ if (event_initialized(&tty->key_timer))
+ evtimer_del(&tty->key_timer);
tty_stop_tty(tty);
if (tty->flags & TTY_OPENED) {
Modified: trunk/window.c
===================================================================
--- trunk/window.c 2012-03-18 01:58:09 UTC (rev 2735)
+++ trunk/window.c 2012-03-18 01:59:34 UTC (rev 2736)
@@ -347,7 +347,8 @@
if (w->layout_root != NULL)
layout_free(w);
- evtimer_del(&w->name_timer);
+ if (event_initialized(&w->name_timer))
+ evtimer_del(&w->name_timer);
options_free(&w->options);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
