From: Jack Lange Date: Wed, 3 Feb 2010 23:00:02 +0000 (-0600) Subject: fixed sprintf configuration dependencies X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=0f39a3ad28d0419f551a7efd68aea0bb4224de98 fixed sprintf configuration dependencies --- diff --git a/Kconfig b/Kconfig index b9a53a2..95ea8e7 100644 --- a/Kconfig +++ b/Kconfig @@ -300,12 +300,6 @@ config BUILT_IN_VSPRINTF help This enables Palacios' internal implementation of vsprintf -config BUILT_IN_VSNPRINTF - bool "vsnprintf()" - default n - depends on BUILT_IN_STDIO - help - This enables Palacios' internal implementation of vsnprintf config BUILT_IN_VSNRPRINTF bool "vsnrprintf()" diff --git a/palacios/src/palacios/vmm_sprintf.c b/palacios/src/palacios/vmm_sprintf.c index c573e3a..b80f3fa 100644 --- a/palacios/src/palacios/vmm_sprintf.c +++ b/palacios/src/palacios/vmm_sprintf.c @@ -91,7 +91,6 @@ struct snprintf_arg { ( defined(CONFIG_BUILT_IN_SPRINTF) || \ defined(CONFIG_BUILT_IN_SNPRINTF) || \ defined(CONFIG_BUILT_IN_VSPRINTF) || \ - defined(CONFIG_BUILT_IN_VSNPRINTF) || \ defined(CONFIG_BUILT_IN_VSNRPRINTF )) static char * ksprintn(char * nbuf, uint64_t num, int base, int *len, int upper); @@ -146,7 +145,7 @@ int snprintf(char * str, size_t size, const char * format, ...) { #endif -#ifdef CONFIG_BUILT_IN_VSNPRINTF + /* * Scaled down version of vsnprintf(3). */ @@ -162,7 +161,7 @@ int vsnprintf(char * str, size_t size, const char * format, va_list ap) { } return (retval); } -#endif + #ifdef CONFIG_BUILT_IN_VSNRPRINTF