discard doc_first_mark in favour of vmark_first.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/core-mark.c b/core-mark.c
index 18501ea4814b54be1bc3644f78ded2990653b6cb..14398b1cacdccb4d3f1824c3ff78b56518a25a07 100644 (file)
--- a/core-mark.c
+++ b/core-mark.c
@@ -340,20 +340,6 @@ void mark_reset(struct doc *d, struct mark *m)
        __mark_reset(d, m, 0, 0);
 }
 
-struct mark *doc_first_mark(struct doc *d, int view)
-{
-       struct tlist_head *tl;
-
-       if (view < 0 || view >= d->nviews || d->views[view].notify == NULL)
-               return NULL;
-       if (tlist_empty(&d->views[view].head))
-               return NULL;
-       tlist_for_each(tl, &d->views[view].head)
-               if (TLIST_TYPE(tl) == GRP_MARK)
-                       return tlist_entry(tl, struct mark, view);
-       return NULL;
-}
-
 struct mark *doc_next_mark(struct mark *m)
 {
        struct tlist_head *tl = &m->view;

diff --git a/core.h b/core.h
index 15b3d0cc9711592f467d045c796a658bc3d29155..70a1dc2b7362d65d6d35fdd9e56673425087cd42 100644 (file)
--- a/core.h
+++ b/core.h
@@ -152,7 +152,6 @@ struct mark *doc_first_mark_all(struct doc *d);
 struct mark *doc_next_mark_all(struct mark *m);
 struct mark *doc_prev_mark_all(struct mark *m);
 struct mark *doc_prev_mark_all_safe(struct doc *d, struct mark *m);
-struct mark *doc_first_mark(struct doc *d, int viewnum);
 struct mark *doc_next_mark(struct mark *m);
 struct mark *doc_prev_mark(struct mark *m);
 void point_reset(struct mark *p);

diff --git a/lib-line-count.c b/lib-line-count.c
index 61bed8ba23a608f4b5f1597a43b3a6cd0ecdaf44..4edadb55e5d3ca316999aff4be5db3b2995dd877 100644 (file)
--- a/lib-line-count.c
+++ b/lib-line-count.c
@@ -90,12 +90,11 @@ DEF_CMD(count_notify)
                return 1;
        }
        if (strcmp(ci->key, "Release") == 0) {
-               struct doc *d = ci->home->data;
                struct mark *m;
                int i = doc_find_view(ci->home, ci->comm);
                if (i < 0)
                        return 0;
-               while ((m = doc_first_mark(d, i)) != NULL)
+               while ((m = vmark_first(ci->home, i)) != NULL)
                        mark_free(m);
                doc_del_view(ci->home, ci->comm);
        }
@@ -134,7 +133,7 @@ static void count_calculate(struct doc *d, struct mark *start, struct mark *end)
        if (type < 0)
                type = doc_add_view(d->home, &count_notify, 0);
 
-       m = doc_first_mark(d, type);
+       m = vmark_first(d->home, type);
        if (m == NULL) {
                /* No marks yet, let's make some */
                m = doc_new_mark(d, type);