 @@ -1,14 +1,14 @@
-/* $NetBSD: lst.c,v 1.90 2020/10/25 13:06:12 rillig Exp $ */
+/* $NetBSD: lst.c,v 1.91 2020/10/28 02:43:16 rillig Exp $ */
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "make.h"
-MAKE_RCSID("$NetBSD: lst.c,v 1.90 2020/10/25 13:06:12 rillig Exp $");
+MAKE_RCSID("$NetBSD: lst.c,v 1.91 2020/10/28 02:43:16 rillig Exp $");
 static ListNode *
 LstNodeNew(ListNode *prev, ListNode *next, void *datum)
+{
     ListNode *node = bmake_malloc(sizeof *node);
     node->prev = prev;
     node->next = next;
     node->datum = datum;
     return node;
+}
 /* Create and initialize a new, empty list. */
 List *
 @@ -273,35 +273,26 @@ Lst_Dequeue(List *list)
     assert(datum != NULL);	/* since NULL would mean end of the list */
     return datum;
+}
 void
 Vector_Init(Vector *v, size_t itemSize)
+{
     v->len = 0;
     v->priv_cap = 10;
     v->itemSize = itemSize;
     v->items = bmake_malloc(v->priv_cap * v->itemSize);
+}
 /* Return the pointer to the given item in the vector.
  * The returned data is valid until the next modifying operation. */
 void *
 Vector_Get(Vector *v, size_t i)
     unsigned char *items = v->items;
     return items + i * v->itemSize;
 /* Add space for a new item to the vector and return a pointer to that space.
  * The returned data is valid until the next modifying operation. */
 void *
 Vector_Push(Vector *v)
+{
     if (v->len >= v->priv_cap) {
 	v->priv_cap *= 2;
 	v->items = bmake_realloc(v->items, v->priv_cap * v->itemSize);
+    }
     v->len++;
     return Vector_Get(v, v->len - 1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lst.h,v 1.83 2020/10/25 13:31:16 rillig Exp $	*/
+/*	$NetBSD: lst.h,v 1.84 2020/10/28 02:43:16 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -160,19 +160,28 @@ void Lst_Enqueue(List *, void *);
 /* Remove the head node of the queue and return its datum. */
 void *Lst_Dequeue(List *);
 /* A vector is an ordered collection of items, allowing for fast indexed
  * access. */
 typedef struct Vector {
     void *items;		/* memory holding the items */
     size_t itemSize;		/* size of a single item in bytes */
     size_t len;			/* number of actually usable elements */
     size_t priv_cap;		/* capacity */
 } Vector;
 void Vector_Init(Vector *, size_t);
 void *Vector_Get(Vector *, size_t);
 /* Return the pointer to the given item in the vector.
  * The returned data is valid until the next modifying operation. */
 static inline MAKE_ATTR_UNUSED void *
 Vector_Get(Vector *v, size_t i)
+{
     unsigned char *items = v->items;
     return items + i * v->itemSize;
+}
 void *Vector_Push(Vector *);
 void *Vector_Pop(Vector *);
 void Vector_Done(Vector *);
 #endif /* MAKE_LST_H */