From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49626 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKBjX-0006by-Uy for qemu-devel@nongnu.org; Sun, 21 Nov 2010 10:21:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKBjW-0004n9-P5 for qemu-devel@nongnu.org; Sun, 21 Nov 2010 10:21:39 -0500 Received: from mail-gw0-f45.google.com ([74.125.83.45]:51639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKBjW-0004n4-Ma for qemu-devel@nongnu.org; Sun, 21 Nov 2010 10:21:38 -0500 Received: by gwj22 with SMTP id 22so509251gwj.4 for ; Sun, 21 Nov 2010 07:21:38 -0800 (PST) Message-ID: <4CE938FF.7080901@codemonkey.ws> Date: Sun, 21 Nov 2010 09:21:35 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] slirp: Remove unused code for bad sprintf References: <1289852126-21041-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <1289852126-21041-1-git-send-email-weil@mail.berlios.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Blue Swirl , QEMU Developers On 11/15/2010 02:15 PM, Stefan Weil wrote: > Neither DECLARE_SPRINTF nor BAD_SPRINTF are needed for QEMU. > > QEMU won't support systems with missing or bad declarations > for sprintf. The unused code was detected while looking for > functions with missing format checking. Instead of adding > GCC_FMT_ATTR, the unused code was removed. > > Cc: Blue Swirl > Signed-off-by: Stefan Weil > Applied. Thanks. Regards, Anthony Liguori > --- > slirp/misc.c | 42 ------------------------------------------ > slirp/slirp.h | 14 -------------- > slirp/slirp_config.h | 6 ------ > 3 files changed, 0 insertions(+), 62 deletions(-) > > diff --git a/slirp/misc.c b/slirp/misc.c > index 1aeb401..19dbec4 100644 > --- a/slirp/misc.c > +++ b/slirp/misc.c > @@ -264,48 +264,6 @@ void lprint(const char *format, ...) > va_end(args); > } > > -#ifdef BAD_SPRINTF > - > -#undef vsprintf > -#undef sprintf > - > -/* > - * Some BSD-derived systems have a sprintf which returns char * > - */ > - > -int > -vsprintf_len(string, format, args) > - char *string; > - const char *format; > - va_list args; > -{ > - vsprintf(string, format, args); > - return strlen(string); > -} > - > -int > -#ifdef __STDC__ > -sprintf_len(char *string, const char *format, ...) > -#else > -sprintf_len(va_alist) va_dcl > -#endif > -{ > - va_list args; > -#ifdef __STDC__ > - va_start(args, format); > -#else > - char *string; > - char *format; > - va_start(args); > - string = va_arg(args, char *); > - format = va_arg(args, char *); > -#endif > - vsprintf(string, format, args); > - return strlen(string); > -} > - > -#endif > - > void > u_sleep(int usec) > { > diff --git a/slirp/slirp.h b/slirp/slirp.h > index 462292d..dfd977a 100644 > --- a/slirp/slirp.h > +++ b/slirp/slirp.h > @@ -237,20 +237,6 @@ void if_start(Slirp *); > void if_start(struct ttys *); > #endif > > -#ifdef BAD_SPRINTF > -# define vsprintf vsprintf_len > -# define sprintf sprintf_len > - extern int vsprintf_len(char *, const char *, va_list); > - extern int sprintf_len(char *, const char *, ...); > -#endif > - > -#ifdef DECLARE_SPRINTF > -# ifndef BAD_SPRINTF > - extern int vsprintf(char *, const char *, va_list); > -# endif > - extern int vfprintf(FILE *, const char *, va_list); > -#endif > - > #ifndef HAVE_STRERROR > extern char *strerror(int error); > #endif > diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h > index f19c703..18db45c 100644 > --- a/slirp/slirp_config.h > +++ b/slirp/slirp_config.h > @@ -85,9 +85,6 @@ > /* Define if the machine is big endian */ > //#undef HOST_WORDS_BIGENDIAN > > -/* Define if your sprintf returns char * instead of int */ > -#undef BAD_SPRINTF > - > /* Define if you have readv */ > #undef HAVE_READV > > @@ -97,9 +94,6 @@ > #define DECLARE_IOVEC > #endif > > -/* Define if a declaration of sprintf/fprintf is needed */ > -#undef DECLARE_SPRINTF > - > /* Define if you have a POSIX.1 sys/wait.h */ > #undef HAVE_SYS_WAIT_H > >