Sparse fixes: NULL use, header order, ANSI prototypes, static

Fix Sparse warnings:
 * use NULL instead of plain 0
 * rearrange header include order to avoid redefining types accidentally
 * ANSIfy SLIRP
 * avoid "restrict" keyword
 * add static



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6736 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 5 insertions, 16 deletions

diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index 2e6e2b214..5375414f2 100644
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -18,16 +18,13 @@ static void sbappendsb(struct sbuf *sb, struct mbuf *m);
  */
 
 void
-sbfree(sb)
-	struct sbuf *sb;
+sbfree(struct sbuf *sb)
 {
 	free(sb->sb_data);
 }
 
 void
-sbdrop(sb, num)
-	struct sbuf *sb;
-	int num;
+sbdrop(struct sbuf *sb, int num)
 {
 	/*
 	 * We can only drop how much we have
@@ -43,9 +40,7 @@ sbdrop(sb, num)
 }
 
 void
-sbreserve(sb, size)
-	struct sbuf *sb;
-	int size;
+sbreserve(struct sbuf *sb, int size)
 {
 	if (sb->sb_data) {
 		/* Already alloced, realloc if necessary */
@@ -74,9 +69,7 @@ sbreserve(sb, size)
  * (the socket is non-blocking, so we won't hang)
  */
 void
-sbappend(so, m)
-	struct socket *so;
-	struct mbuf *m;
+sbappend(struct socket *so, struct mbuf *m)
 {
 	int ret = 0;
 
@@ -173,11 +166,7 @@ sbappendsb(struct sbuf *sb, struct mbuf *m)
  * done in sbdrop when the data is acked
  */
 void
-sbcopy(sb, off, len, to)
-	struct sbuf *sb;
-	int off;
-	int len;
-	char *to;
+sbcopy(struct sbuf *sb, int off, int len, char *to)
 {
 	char *from;