tv_dict_watcher_notify: any_needs_free

This commit is contained in:
Daniel Hahler 2019-11-30 02:06:16 +01:00 committed by Jan Edmund Lazo
parent aca002e7d5
commit d6cac809b0
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15

View File

@ -1267,6 +1267,7 @@ void tv_dict_watcher_notify(dict_T *const dict, const char *const key,
typval_T rettv;
bool any_needs_free = false;
dict->dv_refcount++;
QUEUE *w;
QUEUE_FOREACH(w, &dict->watchers, {
@ -1277,15 +1278,20 @@ void tv_dict_watcher_notify(dict_T *const dict, const char *const key,
callback_call(&watcher->callback, 3, argv, &rettv);
watcher->busy = false;
tv_clear(&rettv);
if (watcher->needs_free) {
any_needs_free = true;
}
}
})
QUEUE_FOREACH(w, &dict->watchers, {
DictWatcher *watcher = tv_dict_watcher_node_data(w);
if (watcher->needs_free) {
QUEUE_REMOVE(w);
tv_dict_watcher_free(watcher);
}
})
if (any_needs_free) {
QUEUE_FOREACH(w, &dict->watchers, {
DictWatcher *watcher = tv_dict_watcher_node_data(w);
if (watcher->needs_free) {
QUEUE_REMOVE(w);
tv_dict_watcher_free(watcher);
}
})
}
tv_dict_unref(dict);
for (size_t i = 1; i < ARRAY_SIZE(argv); i++) {