return channel;
}
+/*
+ * Return TRUE if "channel" has a callback.
+ */
+ static int
+channel_has_callback(channel_T *channel)
+{
+ return channel->ch_callback != NULL
+#ifdef CHANNEL_PIPES
+ || channel->ch_part[PART_OUT].ch_callback != NULL
+ || channel->ch_part[PART_ERR].ch_callback != NULL
+#endif
+ || channel->ch_close_cb != NULL;
+}
+
+/*
+ * Close a channel and free all its resources if there is no further action
+ * possible, there is no callback to be invoked.
+ */
+ void
+channel_may_free(channel_T *channel)
+{
+ if (!channel_has_callback(channel))
+ channel_free(channel);
+}
+
/*
* Close a channel and free all its resources.
*/
/*
* Close channel "channel".
- * This does not trigger the close callback.
+ * Trigger the close callback if "invoke_close_cb" is TRUE.
*/
void
channel_close(channel_T *channel, int invoke_close_cb)
while (channel != NULL)
{
+ if (channel->ch_refcount == 0 && !channel_has_callback(channel))
+ {
+ /* channel is no longer useful, free it */
+ channel_free(channel);
+ channel = first_channel;
+ part = PART_SOCK;
+ continue;
+ }
if (channel->ch_part[part].ch_fd != INVALID_FD)
{
/* Increase the refcount, in case the handler causes the channel
#if defined(FEAT_CHANNEL) || defined(PROTO)
/*
- * Decrement the reference count on "channel" and free it when it goes down to
- * zero.
+ * Decrement the reference count on "channel" and maybe free it when it goes
+ * down to zero. Don't free it if there is a pending action.
* Returns TRUE when the channel was freed.
*/
int
{
if (channel != NULL && --channel->ch_refcount <= 0)
{
- channel_free(channel);
+ channel_may_free(channel);
return TRUE;
}
return FALSE;
void ch_log(channel_T *ch, char *msg);
void ch_logs(channel_T *ch, char *msg, char *name);
channel_T *add_channel(void);
+void channel_may_free(channel_T *channel);
void channel_free(channel_T *channel);
void channel_gui_register(channel_T *channel);
void channel_gui_register_all(void);