svn commit: r334632 - head/usr.bin/indent

[Piotr Pawel Stefaniak]

Author: pstef
Date: Mon Jun  4 20:39:58 2018
New Revision: 334632
URL: https://svnweb.freebsd.org/changeset/base/334632

Log:
  indent(1): remove the STACKSIZE macro and all of its use
  
  It conflicts with a system-provided macro of the same name on another OS.

Modified:
  head/usr.bin/indent/indent_globs.h
  head/usr.bin/indent/parse.c

Modified: head/usr.bin/indent/indent_globs.h
==============================================================================
--- head/usr.bin/indent/indent_globs.h	Mon Jun  4 20:34:53 2018	(r334631)
+++ head/usr.bin/indent/indent_globs.h	Mon Jun  4 20:39:58 2018	(r334632)
@@ -219,13 +219,11 @@ int	    auto_typedefs;		/* set true to recognize ident
 int	    space_after_cast;		/* "b = (int) a" vs "b = (int)a" */
 int	    tabsize;			/* the size of a tab */
 
-#define	STACKSIZE 256
-
 struct parser_state {
     int         last_token;
-    int         p_stack[STACKSIZE];	/* this is the parsers stack */
-    int         il[STACKSIZE];	/* this stack stores indentation levels */
-    float       cstk[STACKSIZE];/* used to store case stmt indentation levels */
+    int         p_stack[256];	/* this is the parsers stack */
+    int         il[64];		/* this stack stores indentation levels */
+    float       cstk[32];	/* used to store case stmt indentation levels */
     int         box_com;	/* set to true when we are in a "boxed"
 				 * comment. In that case, the first non-blank
 				 * char should be lined up with the / in / followed by * */

Modified: head/usr.bin/indent/parse.c
==============================================================================
--- head/usr.bin/indent/parse.c	Mon Jun  4 20:34:53 2018	(r334631)
+++ head/usr.bin/indent/parse.c	Mon Jun  4 20:39:58 2018	(r334632)
@@ -42,10 +42,12 @@ static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6
 #endif
 
 #include <sys/cdefs.h>
+#include <sys/param.h>
 __FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <stdio.h>
+
 #include "indent_globs.h"
 #include "indent_codes.h"
 #include "indent.h"
@@ -209,7 +211,7 @@ parse(int tk) /* tk: the code for the construct scanne
 
     }				/* end of switch */
 
-    if (ps.tos >= STACKSIZE - 1)
+    if (ps.tos >= nitems(ps.p_stack) - 1)
 	errx(1, "Parser stack overflow");
 
     reduce();			/* see if any reduction can be done */