aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-11-28 09:56:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-11-28 10:03:07 +0000
commit66b8c92c30667327ce7b5de3cbc068be67b3719a (patch)
tree0c4db3ba26946671f93439f9a519914791795d53
parentgrid: remove useless assertion (diff)
grid: uri_range_erase: walk the ranges backwards
This way, ranges are deleted last-to-first, thus avoiding memmoving multiple ranges over and over again when erasing e.g. a full line.
-rw-r--r--grid.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/grid.c b/grid.c
index c0e10b23..bfb07d16 100644
--- a/grid.c
+++ b/grid.c
@@ -1143,19 +1143,18 @@ grid_row_uri_range_erase(struct row *row, int start, int end)
struct row_data *extra = row->extra;
/* Split up, or remove, URI ranges affected by the erase */
- for (ssize_t i = 0; i < extra->uri_ranges.count; i++) {
+ for (ssize_t i = (ssize_t)extra->uri_ranges.count - 1; i >= 0; i--) {
struct row_uri_range *old = &extra->uri_ranges.v[i];
if (old->end < start)
- continue;
+ return;
if (old->start > end)
- return;
+ continue;
if (start <= old->start && end >= old->end) {
/* Erase range covers URI completely - remove it */
uri_range_delete(extra, i);
- i--;
}
else if (start > old->start && end < old->end) {
@@ -1170,13 +1169,13 @@ grid_row_uri_range_erase(struct row *row, int start, int end)
/* Erase range erases the head of the URI */
xassert(start <= old->start);
old->start = end + 1;
- return; /* There can be no more overlapping URIs */
}
else if (start <= old->end && end >= old->end) {
/* Erase range erases the tail of the URI */
xassert(end >= old->end);
old->end = start - 1;
+ return; /* There can be no more overlapping URIs */
}
}
}