svn commit: r352651 - head/lib/libc/regex

[Yuri Pankov]

Author: yuripv
Date: Tue Sep 24 12:21:01 2019
New Revision: 352651
URL: https://svnweb.freebsd.org/changeset/base/352651

Log:
  lib/libc/regex: fix build with REDEBUG defined
  
  Reviewed by:	kevans
  Differential Revision:	https://reviews.freebsd.org/D21760

Modified:
  head/lib/libc/regex/engine.c
  head/lib/libc/regex/regcomp.c

Modified: head/lib/libc/regex/engine.c
==============================================================================
--- head/lib/libc/regex/engine.c	Tue Sep 24 06:37:01 2019	(r352650)
+++ head/lib/libc/regex/engine.c	Tue Sep 24 12:21:01 2019	(r352651)
@@ -1068,7 +1068,7 @@ print(struct match *m,
 		fprintf(d, " %s", pchar(ch));
 	for (i = 0; i < g->nstates; i++)
 		if (ISSET(st, i)) {
-			fprintf(d, "%s%d", (first) ? "\t" : ", ", i);
+			fprintf(d, "%s%lu", (first) ? "\t" : ", ", i);
 			first = 0;
 		}
 	fprintf(d, "\n");

Modified: head/lib/libc/regex/regcomp.c
==============================================================================
--- head/lib/libc/regex/regcomp.c	Tue Sep 24 06:37:01 2019	(r352650)
+++ head/lib/libc/regex/regcomp.c	Tue Sep 24 12:21:01 2019	(r352651)
@@ -196,12 +196,6 @@ static char nuls[10];		/* place to point scanner in ev
 #define	THERETHERE()	(p->slen - 2)
 #define	DROP(n)	(p->slen -= (n))
 
-#ifndef NDEBUG
-static int never = 0;		/* for use in asserts; shuts lint up */
-#else
-#define	never	0		/* some <assert.h>s have bugs too */
-#endif
-
 /* Macro used by computejump()/computematchjump() */
 #define MIN(a,b)	((a)<(b)?(a):(b))