patch 8.1.1710: Coverity found dead code
Problem: Coverity found dead code.
Solution: Remove merging of listener changes.
diff --git a/src/change.c b/src/change.c
index 761e764..0f6164b 100644
--- a/src/change.c
+++ b/src/change.c
@@ -155,19 +155,16 @@
static long next_listener_id = 0;
/*
- * Check if the change at "lnum" / "col" is above or overlaps with an existing
- * changed. If above then flush changes and invoke listeners.
- * If "merge" is TRUE do the merge.
+ * Check if the change at "lnum" is above or overlaps with an existing
+ * change. If above then flush changes and invoke listeners.
* Returns TRUE if the change was merged.
*/
static int
check_recorded_changes(
buf_T *buf,
linenr_T lnum,
- colnr_T col,
linenr_T lnume,
- long xtra,
- int merge)
+ long xtra)
{
if (buf->b_recorded_changes != NULL && xtra != 0)
{
@@ -182,42 +179,12 @@
li->li_tv.vval.v_dict, (char_u *)"lnum");
prev_lnume = (linenr_T)dict_get_number(
li->li_tv.vval.v_dict, (char_u *)"end");
- if (prev_lnum >= lnum || prev_lnum > lnume
- || (prev_lnume >= lnum && xtra != 0))
+ if (prev_lnum >= lnum || prev_lnum > lnume || prev_lnume >= lnum)
{
- if (li->li_next == NULL && lnum == prev_lnum
- && xtra == 0
- && col + 1 == (colnr_T)dict_get_number(
- li->li_tv.vval.v_dict, (char_u *)"col"))
- {
- if (merge)
- {
- dictitem_T *di;
-
- // Same start point and nothing is following, entries
- // can be merged.
- di = dict_find(li->li_tv.vval.v_dict,
- (char_u *)"end", -1);
- if (di != NULL)
- {
- prev_lnum = tv_get_number(&di->di_tv);
- if (lnume > prev_lnum)
- di->di_tv.vval.v_number = lnume;
- }
- di = dict_find(li->li_tv.vval.v_dict,
- (char_u *)"added", -1);
- if (di != NULL)
- di->di_tv.vval.v_number += xtra;
- return TRUE;
- }
- }
- else
- {
- // the current change is going to make the line number in
- // the older change invalid, flush now
- invoke_listeners(curbuf);
- break;
- }
+ // the current change is going to make the line number in
+ // the older change invalid, flush now
+ invoke_listeners(curbuf);
+ break;
}
}
}
@@ -242,7 +209,7 @@
// If the new change is going to change the line numbers in already listed
// changes, then flush.
- if (check_recorded_changes(curbuf, lnum, col, lnume, xtra, TRUE))
+ if (check_recorded_changes(curbuf, lnum, lnume, xtra))
return;
if (curbuf->b_recorded_changes == NULL)
@@ -362,7 +329,7 @@
void
may_invoke_listeners(buf_T *buf, linenr_T lnum, linenr_T lnume, int added)
{
- check_recorded_changes(buf, lnum, 0, lnume, added, FALSE);
+ check_recorded_changes(buf, lnum, lnume, added);
}
/*