From owner-svn-src-head@FreeBSD.ORG Tue May 21 19:20:04 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 926BC264; Tue, 21 May 2013 19:20:04 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C267830; Tue, 21 May 2013 19:20:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4LJK42F021028; Tue, 21 May 2013 19:20:04 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4LJK3Qs021022; Tue, 21 May 2013 19:20:03 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201305211920.r4LJK3Qs021022@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 21 May 2013 19:20:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250876 - head/contrib/flex X-SVN-Group: head 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.14 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: Tue, 21 May 2013 19:20:04 -0000 Author: jkim Date: Tue May 21 19:20:03 2013 New Revision: 250876 URL: http://svnweb.freebsd.org/changeset/base/250876 Log: Do not use log10(3) to get rid of libm dependency. It is really not useful. Modified: head/contrib/flex/buf.c head/contrib/flex/flexdef.h head/contrib/flex/main.c Modified: head/contrib/flex/buf.c ============================================================================== --- head/contrib/flex/buf.c Tue May 21 19:17:02 2013 (r250875) +++ head/contrib/flex/buf.c Tue May 21 19:20:03 2013 (r250876) @@ -95,7 +95,7 @@ struct Buf *buf_linedir (struct Buf *buf t = flex_alloc (strlen ("#line \"\"\n") + /* constant parts */ 2 * strlen (filename) + /* filename with possibly all backslashes escaped */ - (int) (1 + log10 (abs (lineno))) + /* line number */ + NUMCHARLINES + /* line number */ 1); /* NUL */ if (!t) flexfatal (_("Allocation of buffer for line directive failed")); Modified: head/contrib/flex/flexdef.h ============================================================================== --- head/contrib/flex/flexdef.h Tue May 21 19:17:02 2013 (r250875) +++ head/contrib/flex/flexdef.h Tue May 21 19:20:03 2013 (r250876) @@ -61,7 +61,6 @@ char *alloca (); #include #include #include -#include #endif #ifdef HAVE_ASSERT_H #include @@ -171,6 +170,9 @@ char *alloca (); */ #define NUMDATALINES 10 +/* Number of characters to print a line number, i.e., 1 + log10(INT_MAX) */ +#define NUMCHARLINES 10 + /* transition_struct_out() definitions. */ #define TRANS_STRUCT_PRINT_LENGTH 14 Modified: head/contrib/flex/main.c ============================================================================== --- head/contrib/flex/main.c Tue May 21 19:17:02 2013 (r250875) +++ head/contrib/flex/main.c Tue May 21 19:20:03 2013 (r250876) @@ -451,7 +451,7 @@ void check_options () char *str, *fmt = "#define %s %d\n"; size_t strsz; - str = (char*)flex_alloc(strsz = strlen(fmt) + strlen(scname[i]) + (int)(1 + log10(i)) + 2); + str = (char*)flex_alloc(strsz = strlen(fmt) + strlen(scname[i]) + NUMCHARLINES + 2); if (!str) flexfatal(_("allocation of macro definition failed")); snprintf(str, strsz, fmt, scname[i], i - 1);