api/vim.c: use FOR_ALL_* sugar #1963

1 files changed, 4 insertions, 12 deletions

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index b7b2f7630c..a84d3a4c92 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -362,20 +362,16 @@ void vim_report_error(String str)
 ArrayOf(Buffer) vim_get_buffers(void)
 {
   Array rv = ARRAY_DICT_INIT;
-  buf_T *b = firstbuf;
 
-  while (b) {
+  FOR_ALL_BUFFERS(b) {
     rv.size++;
-    b = b->b_next;
   }
 
   rv.items = xmalloc(sizeof(Object) * rv.size);
   size_t i = 0;
-  b = firstbuf;
 
-  while (b) {
+  FOR_ALL_BUFFERS(b) {
     rv.items[i++] = BUFFER_OBJ(b->handle);
-    b = b->b_next;
   }
 
   return rv;
@@ -469,20 +465,16 @@ void vim_set_current_window(Window window, Error *err)
 ArrayOf(Tabpage) vim_get_tabpages(void)
 {
   Array rv = ARRAY_DICT_INIT;
-  tabpage_T *tp = first_tabpage;
 
-  while (tp) {
+  FOR_ALL_TABS(tp) {
     rv.size++;
-    tp = tp->tp_next;
   }
 
   rv.items = xmalloc(sizeof(Object) * rv.size);
   size_t i = 0;
-  tp = first_tabpage;
 
-  while (tp) {
+  FOR_ALL_TABS(tp) {
     rv.items[i++] = TABPAGE_OBJ(tp->handle);
-    tp = tp->tp_next;
   }
 
   return rv;