From 1324b0ca9f8a7fdaf03b374c75eb3c9df407c2f1 Mon Sep 17 00:00:00 2001 From: Colin Harrison Date: Fri, 10 Dec 2010 00:08:24 +0000 Subject: [PATCH 1/3] Typo in xserver Xvasprintf() I needed this patch in the wrapper around vsnprintf() in os/xprintf.c (MinGW for Windows build) to correct various crashes. Reviewed-by: Alan Coopersmith --- os/xprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/xprintf.c b/os/xprintf.c index 0a8bd0687..254b7374a 100644 --- a/os/xprintf.c +++ b/os/xprintf.c @@ -108,7 +108,7 @@ Xvasprintf(char **ret, const char * _X_RESTRICT_KYWD format, va_list va) return -1; vsnprintf(*ret, size + 1, format, va); - ret[size] = 0; + (*ret)[size] = 0; return size; #endif } From 058b889fde47b4c32534f11ed651bf1749d1dbb2 Mon Sep 17 00:00:00 2001 From: David Barksdale Date: Mon, 13 Dec 2010 18:35:20 -0800 Subject: [PATCH 2/3] Bug 21827: faulty sdksyms.c generated by the awk script in sdksyms.sh https://bugs.freedesktop.org/show_bug.cgi?id=21827 Tested-by: Alan Coopersmith Signed-off-by: David Barksdale Signed-off-by: Alan Coopersmith --- hw/xfree86/loader/sdksyms.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh index 356d490fa..f60b8ed74 100755 --- a/hw/xfree86/loader/sdksyms.sh +++ b/hw/xfree86/loader/sdksyms.sh @@ -359,7 +359,7 @@ BEGIN { # skip modifiers, if any $n ~ /^\*?(unsigned|const|volatile|struct)$/ || # skip pointer - $n ~ /\*$/) + $n ~ /^[a-zA-Z0-9_]*\*$/) n++; # type specifier may not be set, as in @@ -367,6 +367,10 @@ BEGIN { if ($n !~ /[^a-zA-Z0-9_]/) n++; + # go back if we are at the parameter list already + if ($n ~ /^[(]([^*].*)?$/) + n--; + # match # extern _X_EXPORT type (* name[])(...) if ($n ~ /^[^a-zA-Z0-9_]+$/) From d5b0d58573ffb90ea70273cd013102168fd2a18a Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 16 Dec 2010 22:29:37 -0800 Subject: [PATCH 3/3] Bug 32436 - hw/xfree86/parser/Makefile.am TOP_SRCDIR should be top_srcdir https://bugs.freedesktop.org/show_bug.cgi?id=32436 Fix typo introduced in 2416255f7e3fd9190a9 that breaks builds when configured --enable-install-libxf86config Signed-off-by: Alan Coopersmith Reviewed-by: Julien Cristau Tested-by: Simon Thum --- hw/xfree86/parser/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am index a5adc01ee..fb5d49e88 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -31,7 +31,7 @@ libxf86config_internal_la_SOURCES = \ $(INTERNAL_SOURCES) libxf86config_a_SOURCES = \ - $(TOP_SRCDIR)/os/xprintf.c \ + $(top_srcdir)/os/xprintf.c \ $(INTERNAL_SOURCES) libxf86config_a_CFLAGS = $(AM_CFLAGS)