From: Michael S. Tsirkin Date: Thu, 21 Nov 2013 12:17:51 +0000 (+0200) Subject: acpi-build: fix build on glib < 2.22 X-Git-Tag: v1.7.0-rc1~12 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=542da88f0013ebb2b2d8ca10becbfebd9948abba acpi-build: fix build on glib < 2.22 g_string_vprintf was only introduced in 2.24 so switch to vsnprintf instead. A bit uglier but name size is fixed at 4 bytes here so it's easy. Reported-by: Richard Henderson Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini Message-id: 1385036128-8753-1-git-send-email-mst@redhat.com Signed-off-by: Anthony Liguori --- diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 486e7055a..59a17dfbd 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -287,16 +287,17 @@ static inline void build_append_array(GArray *array, GArray *val) static void build_append_nameseg(GArray *array, const char *format, ...) { - GString *s = g_string_new(""); + /* It would be nicer to use g_string_vprintf but it's only there in 2.22 */ + char s[] = "XXXX"; + int len; va_list args; va_start(args, format); - g_string_vprintf(s, format, args); + len = vsnprintf(s, sizeof s, format, args); va_end(args); - assert(s->len == 4); - g_array_append_vals(array, s->str, s->len); - g_string_free(s, true); + assert(len == 4); + g_array_append_vals(array, s, len); } /* 5.4 Definition Block Encoding */