Commit 9eca6cc6 authored by Stefan Weil's avatar Stefan Weil Committed by Anthony Liguori
Browse files

slirp: Remove unused code for bad sprintf 



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 <blauwirbel@gmail.com>
Signed-off-by: default avatarStefan Weil <weil@mail.berlios.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 0550f9c1

slirp/misc.c

+0 −42
Original line number Diff line number Diff line
@@ -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)

{

slirp/slirp.h

+0 −14
Original line number Diff line number Diff line
@@ -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

slirp/slirp_config.h

+0 −6
Original line number Diff line number Diff line
@@ -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