Changeset 30045 in vbox for trunk/src/VBox/Devices/Network/slirp/bsd/kern

Timestamp:

Jun 4, 2010 8:38:56 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

62400

Message:

NAT: BSD sbuf.

File:

• trunk/src/VBox/Devices/Network/slirp/bsd/kern/subr_sbuf.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/bsd/kern/subr_sbuf.c

@@ -27 +27 @@
  */
 
+#ifndef VBOX
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/kern/subr_sbuf.c,v 1.30.8.1 2009/04/15 03:14:26 kensmith Exp $");
@@ -59 +60 @@
 #define min(x,y)                MIN(x,y)
 #endif /* _KERNEL */
+#else /* VBOX */
+# include <iprt/param.h>
+# include <iprt/ctype.h>
+# include <slirp.h>
+# define SBMALLOC(size) RTMemAlloc((size))
+# define SBFREE(buf) RTMemFree((buf))
+#endif
 
 /*
@@ -417 +425 @@
         do {
                 va_copy(ap_copy, ap);
+#ifndef VBOX
                 len = vsnprintf(&s->s_buf[s->s_len], SBUF_FREESPACE(s) + 1,
                     fmt, ap_copy);
+#else
+                len = RTStrPrintfV(&s->s_buf[s->s_len], SBUF_FREESPACE(s) + 1,
+                    fmt, ap_copy);
+#endif
                 va_end(ap_copy);
         } while (len > SBUF_FREESPACE(s) &&
@@ -492 +505 @@
                 return (-1);
 
+#ifndef VBOX
         while (s->s_len && isspace(s->s_buf[s->s_len-1]))
                 --s->s_len;
+#else
+        while (s->s_len && RT_C_IS_SPACE(s->s_buf[s->s_len-1]))
+                --s->s_len;
+#endif
 
         return (0);