socsvn commit: r289129 - soc2015/clord/head/sys/contrib/ficl

[clord at FreeBSD.org]

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;