 @@ -1,14 +1,14 @@
-/*	$NetBSD: mem1.c,v 1.57 2021/12/25 13:51:42 rillig Exp $	*/
+/*	$NetBSD: mem1.c,v 1.58 2022/02/27 06:55:13 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem1.c,v 1.57 2021/12/25 13:51:42 rillig Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.58 2022/02/27 06:55:13 rillig Exp $");
 #endif
 #include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Filenames allocated by record_filename are shared and have unlimited
  * lifetime.
  */
 struct filename {
 @@ -187,29 +187,26 @@ typedef struct memory_block {
 	size_t	size;			/* total size of memory block */
 	struct	memory_block *next;
 } memory_block;
 /*
  * Array of pointers to lists of memory blocks. mem_block_level is used as
  * index into this array.
  */
 static	memory_block	**mblks;
 /* number of elements in *mblks */
 static	size_t	nmblks;
 /* free list for memory blocks */
 static	memory_block	*frmblks;
 /* length of new allocated memory blocks */
 static	size_t	mblklen;
 static memory_block *
 xnewblk(void)
+{
 	memory_block	*mb = xmalloc(sizeof(*mb));
 	mb->start = xmalloc(mblklen);
 	mb->size = mblklen;
 	return mb;
 @@ -225,69 +222,59 @@ xgetblk(memory_block **mbp, size_t s)
 	/*
 	 * If the first block of the list has not enough free space,
 	 * or there is no first block, get a new block. The new block
 	 * is taken from the free list or, if there is no block on the
 	 * free list, is allocated using xnewblk().
+	 *
 	 * If a new block is allocated it is initialized with zero.
 	 * Blocks taken from the free list are zero'd in xfreeblk().
 	 */
 	s = WORST_ALIGN(s);
 	if ((mb = *mbp) == NULL || mb->nfree < s) {
-		if ((mb = frmblks) == NULL || mb->size < s) {
+		if (s > mblklen) {
-			if (s > mblklen) {
+			t = mblklen;
-				t = mblklen;
+			mblklen = s;
 				mblklen = s;
 		mb = xnewblk();
 			mb = xnewblk();
 #ifndef BLKDEBUG
-			(void)memset(mb->start, 0, mb->size);
+		(void)memset(mb->start, 0, mb->size);
 #endif
-			if (t > 0)
+		if (t > 0)
-				mblklen = t;
+			mblklen = t;
 		} else {
 			frmblks = mb->next;
 		mb->first_free = mb->start;
 		mb->nfree = mb->size;
 		mb->next = *mbp;
 		*mbp = mb;
+	}
 	p = mb->first_free;
 	mb->first_free = (char *)mb->first_free + s;
 	mb->nfree -= s;
 #ifdef BLKDEBUG
 	(void)memset(p, 0, s);
 #endif
 	return p;
+}
-/*
+/* Free all blocks from list *fmbp. */
  * Move all blocks from list *fmbp to free list. For each block, set all
  * used memory to zero.
  */
 static void
 xfreeblk(memory_block **fmbp)
+{
 	memory_block	*mb;
 	while ((mb = *fmbp) != NULL) {
 		*fmbp = mb->next;
-		mb->next = frmblks;
+		free(mb);
 		frmblks = mb;
 		(void)memset(mb->start, INVALID_MEM_BYTE,
 		    mb->size - mb->nfree);
+	}
+}
 void
 initmem(void)
+{
 	mblklen = mem_block_size();
 	mblks = xcalloc(nmblks = ML_INC, sizeof(*mblks));
+}
 /* Allocate memory associated with level l, initialized with zero. */