From owner-svn-soc-all@freebsd.org Mon Aug 3 00:35:42 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1B219AF04B for ; Mon, 3 Aug 2015 00:35:42 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8B459DE for ; Mon, 3 Aug 2015 00:35:42 +0000 (UTC) (envelope-from clord@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t730Zgtu061187 for ; Mon, 3 Aug 2015 00:35:42 GMT (envelope-from clord@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t730ZfaO061145 for svn-soc-all@FreeBSD.org; Mon, 3 Aug 2015 00:35:41 GMT (envelope-from clord@FreeBSD.org) Date: Mon, 3 Aug 2015 00:35:41 GMT Message-Id: <201508030035.t730ZfaO061145@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to clord@FreeBSD.org using -f From: clord@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289129 - soc2015/clord/head/sys/contrib/ficl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2015 00:35:42 -0000 Author: clord Date: Mon Aug 3 00:35:41 2015 New Revision: 289129 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289129 Log: Remove dependence on sscanf so that libstand can be used in place of stdlib. Modified: soc2015/clord/head/sys/contrib/ficl/ficl.h soc2015/clord/head/sys/contrib/ficl/system.c Modified: soc2015/clord/head/sys/contrib/ficl/ficl.h ============================================================================== --- soc2015/clord/head/sys/contrib/ficl/ficl.h Sun Aug 2 23:17:01 2015 (r289128) +++ soc2015/clord/head/sys/contrib/ficl/ficl.h Mon Aug 3 00:35:41 2015 (r289129) @@ -635,7 +635,9 @@ /* ** the Good Stuff starts here... */ -#define FICL_VERSION "4.1.0" +#define FICL_VERSION "4.1.0" +#define FICL_VERSION_MAJOR 4 +#define FICL_VERSION_MINOR 1 #if !defined (FICL_PROMPT) #define FICL_PROMPT "ok> " Modified: soc2015/clord/head/sys/contrib/ficl/system.c ============================================================================== --- soc2015/clord/head/sys/contrib/ficl/system.c Sun Aug 2 23:17:01 2015 (r289128) +++ soc2015/clord/head/sys/contrib/ficl/system.c Mon Aug 3 00:35:41 2015 (r289129) @@ -81,20 +81,15 @@ ficlSystem *ficlSystemGlobal = NULL; -int sscanf(const char * restrict str, const char * restrict format, ...); - /************************************************************************** f i c l S e t V e r s i o n E n v ** Create a double ficlCell environment constant for the version ID **************************************************************************/ static void ficlSystemSetVersion(ficlSystem *system) { - int major = 0; - int minor = 0; ficl2Integer combined; ficlDictionary *environment = ficlSystemGetEnvironment(system); - sscanf(FICL_VERSION, "%d.%d", &major, &minor); - FICL_2INTEGER_SET(major, minor, combined); + FICL_2INTEGER_SET(FICL_VERSION_MAJOR, FICL_VERSION_MINOR, combined); ficlDictionarySet2Constant(environment, "ficl-version", combined); ficlDictionarySetConstant(environment, "ficl-robust", FICL_ROBUST); return;