From owner-svn-src-head@freebsd.org Mon Jun 4 20:40:00 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05FF4FEFF8F; Mon, 4 Jun 2018 20:40:00 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ADDE884FE4; Mon, 4 Jun 2018 20:39:59 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8EF17126A1; Mon, 4 Jun 2018 20:39:59 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w54Kdx20051732; Mon, 4 Jun 2018 20:39:59 GMT (envelope-from pstef@FreeBSD.org) Received: (from pstef@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w54KdxGC051730; Mon, 4 Jun 2018 20:39:59 GMT (envelope-from pstef@FreeBSD.org) Message-Id: <201806042039.w54KdxGC051730@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pstef set sender to pstef@FreeBSD.org using -f From: Piotr Pawel Stefaniak Date: Mon, 4 Jun 2018 20:39:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334632 - head/usr.bin/indent X-SVN-Group: head X-SVN-Commit-Author: pstef X-SVN-Commit-Paths: head/usr.bin/indent X-SVN-Commit-Revision: 334632 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2018 20:40:00 -0000 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 +#include __FBSDID("$FreeBSD$"); #include #include + #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 */