Merge tag 'hppa-fixes-8.2-pull-request' of https://github.com/hdeller/qemu-hppa into...

[mirror_qemu.git] / fsdev / 9p-marshal.c

diff --git a/fsdev/9p-marshal.c b/fsdev/9p-marshal.c
index 991e35d24280d70539325b471ec968f0762fb055..f9b0336cd59d7e4247c511d0bcf68e95802c2966 100644 (file)
--- a/fsdev/9p-marshal.c
+++ b/fsdev/9p-marshal.c
@@ -11,20 +11,15 @@
  *
  */
 
-#include <glib.h>
+#include "qemu/osdep.h"
 #include <glib/gprintf.h>
-#include <sys/types.h>
 #include <dirent.h>
-#include <sys/time.h>
 #include <utime.h>
-#include <sys/uio.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
 
-#include "qemu/compiler.h"
 #include "9p-marshal.h"
 
+P9ARRAY_DEFINE_TYPE(V9fsString, v9fs_string_free);
+
 void v9fs_string_free(V9fsString *str)
 {
     g_free(str->data);
@@ -32,12 +27,7 @@ void v9fs_string_free(V9fsString *str)
     str->size = 0;
 }
 
-void v9fs_string_null(V9fsString *str)
-{
-    v9fs_string_free(str);
-}
-
-void GCC_FMT_ATTR(2, 3)
+void G_GNUC_PRINTF(2, 3)
 v9fs_string_sprintf(V9fsString *str, const char *fmt, ...)
 {
     va_list ap;