From owner-svn-src-projects@FreeBSD.ORG Fri May 10 19:07:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 922EFA59; Fri, 10 May 2013 19:07:18 +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 6B0871E9; Fri, 10 May 2013 19:07:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4AJ7IQI008227; Fri, 10 May 2013 19:07:18 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4AJ7HUn008223; Fri, 10 May 2013 19:07:17 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201305101907.r4AJ7HUn008223@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 10 May 2013 19:07:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r250470 - projects/flex-sf/contrib/flex X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2013 19:07:18 -0000 Author: jkim Date: Fri May 10 19:07:17 2013 New Revision: 250470 URL: http://svnweb.freebsd.org/changeset/base/250470 Log: Do not use log10(3) to get rid of libm dependency. It is really not useful. Modified: projects/flex-sf/contrib/flex/buf.c projects/flex-sf/contrib/flex/flexdef.h projects/flex-sf/contrib/flex/main.c Modified: projects/flex-sf/contrib/flex/buf.c ============================================================================== --- projects/flex-sf/contrib/flex/buf.c Fri May 10 18:43:36 2013 (r250469) +++ projects/flex-sf/contrib/flex/buf.c Fri May 10 19:07:17 2013 (r250470) @@ -94,7 +94,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: projects/flex-sf/contrib/flex/flexdef.h ============================================================================== --- projects/flex-sf/contrib/flex/flexdef.h Fri May 10 18:43:36 2013 (r250469) +++ projects/flex-sf/contrib/flex/flexdef.h Fri May 10 19:07:17 2013 (r250470) @@ -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: projects/flex-sf/contrib/flex/main.c ============================================================================== --- projects/flex-sf/contrib/flex/main.c Fri May 10 18:43:36 2013 (r250469) +++ projects/flex-sf/contrib/flex/main.c Fri May 10 19:07:17 2013 (r250470) @@ -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);