 @@ -1,14 +1,14 @@
-/*	$NetBSD: make.h,v 1.127 2020/08/26 23:00:47 rillig Exp $	*/
+/*	$NetBSD: make.h,v 1.128 2020/08/28 03:35:45 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.
 @@ -150,26 +150,27 @@ typedef int  ReturnStatus;
 /*
  * The following statuses overlap with the first 2 generic statuses
  * defined in status.h:
+ *
  * SUCCESS			There was no error.
  * FAILURE			There was a general error.
  */
 #define	SUCCESS			0x00000000
 #define	FAILURE			0x00000001
 #include "lst.h"
 #include "enum.h"
 #include "hash.h"
 #include "config.h"
 #include "buf.h"
 #include "make_malloc.h"
 typedef enum  {
     UNMADE,			/* Not examined yet */
     DEFERRED,			/* Examined once (building child) */
     REQUESTED,			/* on toBeMade list */
     BEINGMADE,			/* Target is already being made.
 				 * Indicates a cycle in the graph. */
     MADE,			/* Was out-of-date and has been made */
     UPTODATE,			/* Was already up-to-date */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 rillig Exp $	*/
+/*	$NetBSD: suff.c,v 1.122 2020/08/28 03:35:45 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.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * 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.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 rillig Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.122 2020/08/28 03:35:45 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.121 2020/08/27 19:15:35 rillig Exp $");
+__RCSID("$NetBSD: suff.c,v 1.122 2020/08/28 03:35:45 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * suff.c --
  *	Functions to maintain suffix lists and find implicit dependents
  *	using suffix transformation rules
+ *
  * Interface:
  *	Suff_Init 	    	Initialize all things to do with suffixes.
+ *
  *	Suff_End 	    	Cleanup the module
 @@ -141,34 +141,38 @@ __RCSID("$NetBSD: suff.c,v 1.121 2020/08
 static Lst       sufflist;	/* Lst of suffixes */
 #ifdef CLEANUP
 static Lst	 suffClean;	/* Lst of suffixes to be cleaned */
 #endif
 static Lst	 srclist;	/* Lst of sources */
 static Lst       transforms;	/* Lst of transformation rules */
 static int        sNum = 0;	/* Counter for assigning suffix numbers */
 typedef enum {
     SUFF_INCLUDE	= 0x01,	/* One which is #include'd */
     SUFF_LIBRARY	= 0x02,	/* One which contains a library */
     SUFF_NULL		= 0x04	/* The empty suffix */
     /* XXX: Why is SUFF_NULL needed? Wouldn't nameLen == 0 mean the same? */
 } SuffFlags;
 ENUM_FLAGS_RTTI_3(SuffFlags,
 		  SUFF_INCLUDE, SUFF_LIBRARY, SUFF_NULL);
 /*
  * Structure describing an individual suffix.
  */
 typedef struct Suff {
-    char         *name;	    	/* The suffix itself */
+    char         *name;	    	/* The suffix itself, such as ".c" */
-    int		 nameLen;	/* Length of the suffix */
+    int		 nameLen;	/* Length of the name, to avoid strlen calls */
     SuffFlags	 flags;      	/* Type of suffix */
     Lst    	 searchPath;	/* The path along which files of this suffix
 				 * may be found */
     int          sNum;	      	/* The suffix number */
     int		 refCount;	/* Reference count of list membership */
     Lst          parents;	/* Suffixes we have a transformation to */
     Lst          children;	/* Suffixes we have a transformation from */
     Lst		 ref;		/* List of lists this suffix is referenced */
 } Suff;
 /*
  * for SuffSuffIsSuffix
  */
 @@ -2592,50 +2596,35 @@ Suff_End(void)
 /********************* DEBUGGING FUNCTIONS **********************/
 static int SuffPrintName(void *s, void *dummy MAKE_ATTR_UNUSED)
+{
     fprintf(debug_file, "%s ", ((Suff *)s)->name);
     return 0;
+}
 static int
 SuffPrintSuff(void *sp, void *dummy MAKE_ATTR_UNUSED)
+{
     Suff    *s = (Suff *)sp;
     int	    flags;
     int	    flag;
     fprintf(debug_file, "# `%s' [%d] ", s->name, s->refCount);
-    flags = s->flags;
+    if (s->flags != 0) {
-    if (flags) {
+	char flags_buf[SuffFlags_ToStringSize];
 	fputs(" (", debug_file);
-	while (flags) {
+	fprintf(debug_file, " (%s)",
-	    flag = 1 << (ffs(flags) - 1);
+		Enum_FlagsToString(flags_buf, sizeof flags_buf,
-	    flags &= ~flag;
+				   s->flags, SuffFlags_ToStringSpecs));
 	    switch (flag) {
 		case SUFF_NULL:
 		    fprintf(debug_file, "NULL");
 		    break;
 		case SUFF_INCLUDE:
 		    fprintf(debug_file, "INCLUDE");
 		    break;
 		case SUFF_LIBRARY:
 		    fprintf(debug_file, "LIBRARY");
 		    break;
 	    fputc(flags ? '|' : ')', debug_file);
+    }
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tTo: ");
     Lst_ForEachS(s->parents, SuffPrintName, NULL);
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tFrom: ");
     Lst_ForEachS(s->children, SuffPrintName, NULL);
     fputc('\n', debug_file);
     fprintf(debug_file, "#\tSearch Path: ");
     Dir_PrintPath(s->searchPath);
     fputc('\n', debug_file);
     return 0;
+}