haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

slirp: Remove obsolete backward-compatibility cruft

Browse source 
The slirp code does not use index() and gethostid() anymore,
so these parts can be removed without problems.
memmove() and strerror() should be available on each of the
supported platforms nowadays, too, so these wrappers are also
not needed anymore.
And we certainly also do not support Ultrix anymore, so no
need to keep the code for this platform anymore.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Thomas Huth 2016-05-13 09:04:30 +02:00 committed by Samuel Thibault
parent cebee21aca
commit 5469feadb1
3 changed files with 0 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
slirp/misc.c
View file

@ -60,27 +60,6 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec,
return 0;
}
#ifndef HAVE_STRERROR
/*
* For systems with no strerror
*/
extern int sys_nerr;
extern char *sys_errlist[];
char *
strerror(error)
int error;
{
if (error < sys_nerr)
return sys_errlist[error];
else
return "Unknown error.";
}
#endif
#ifdef _WIN32

28
slirp/slirp.h
View file

@ -23,11 +23,6 @@ typedef char *caddr_t;
# include <sys/bitypes.h>
#endif
#ifndef HAVE_MEMMOVE
#define memmove(x, y, z) bcopy(y, x, z)
#endif
#ifndef _WIN32
#include <sys/uio.h>
#endif
@ -37,17 +32,6 @@ typedef char *caddr_t;
#include <arpa/inet.h>
#endif
/* Systems lacking strdup() definition in <string.h>. */
#if defined(ultrix)
char *strdup(const char *);
#endif
/* Systems lacking malloc() definition in <stdlib.h>. */
#if defined(ultrix) || defined(hcx)
void *malloc(size_t arg);
void free(void *ptr);
#endif
#ifndef NO_UNIX_SOCKETS
#include <sys/un.h>
#endif
@ -259,18 +243,6 @@ void if_start(Slirp *);
void if_start(struct ttys *);
#endif
#ifndef HAVE_STRERROR
char *strerror(int error);
#endif
#ifndef HAVE_INDEX
char *index(const char *, int);
#endif
#ifndef HAVE_GETHOSTID
long gethostid(void);
#endif
#ifndef _WIN32
#include <netdb.h>
#endif

12
slirp/slirp_config.h
View file

@ -34,9 +34,6 @@
#define HAVE_SYS_FILIO_H
#endif
/* Define if you have strerror */
#define HAVE_STRERROR
/* Define if you have sys/bitypes.h */
#undef HAVE_SYS_BITYPES_H
@ -82,15 +79,6 @@
#define HAVE_INET_ATON
#endif
/* Define if you have index() */
#define HAVE_INDEX
/* Define if you have memmove */
#define HAVE_MEMMOVE
/* Define if you have gethostid */
#define HAVE_GETHOSTID
/* Define if you DON'T have unix-domain sockets */
#undef NO_UNIX_SOCKETS
#ifdef _WIN32