diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2017-07-17 23:06:35 +0200 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2017-07-17 23:31:00 +0200 |
| commit | 5a20ed97ded854198e2c50ca128635e01848a5bb (patch) | |
| tree | bd14eaa3aca449ad09c402a74eb37c5d8dc19f82 /vis-marks.c | |
| parent | 75c7c61ecc4038340fa3acfab71ee19bbafa48a8 (diff) | |
| download | vis-5a20ed97ded854198e2c50ca128635e01848a5bb.tar.gz vis-5a20ed97ded854198e2c50ca128635e01848a5bb.tar.xz | |
vis: specify window in mark related API
This should also fix coverity issue 157024.
Diffstat (limited to 'vis-marks.c')
| -rw-r--r-- | vis-marks.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vis-marks.c b/vis-marks.c index 7bc6ad5..e616f1d 100644 --- a/vis-marks.c +++ b/vis-marks.c @@ -48,7 +48,9 @@ void mark_release(Array *arr) { } static Array *mark_from(Vis *vis, enum VisMark id) { - if (id == VIS_MARK_SELECTION && vis->win) + if (!vis->win) + return NULL; + if (id == VIS_MARK_SELECTION) return &vis->win->saved_selections; File *file = vis->win->file; if (id < LENGTH(file->marks)) @@ -83,8 +85,8 @@ static Array mark_get(Win *win, Array *mark) { return sel; } -Array vis_mark_get(Vis *vis, enum VisMark id) { - return mark_get(vis->win, mark_from(vis, id)); +Array vis_mark_get(Win *win, enum VisMark id) { + return mark_get(win, mark_from(win->vis, id)); } static void mark_set(Win *win, Array *mark, Array *sel) { @@ -100,8 +102,8 @@ static void mark_set(Win *win, Array *mark, Array *sel) { } } -void vis_mark_set(Vis *vis, enum VisMark id, Array *sel) { - mark_set(vis->win, mark_from(vis, id), sel); +void vis_mark_set(Win *win, enum VisMark id, Array *sel) { + mark_set(win, mark_from(win->vis, id), sel); } void marklist_init(MarkList *list, size_t max) { |