xserver: Branch 'master' - 4 commits

[Keith Packard]

 hw/xfree86/loader/sdksyms.sh  |    6 +++++-
 hw/xfree86/parser/Makefile.am |    2 +-
 os/xprintf.c                  |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e7dc253452a1ba64718a08fdc070405b494f53cd
Merge: d110791... d5b0d58...
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Dec 20 00:48:45 2010 -0800

    Merge remote branch 'alanc/master'

commit d5b0d58573ffb90ea70273cd013102168fd2a18a
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Dec 16 22:29:37 2010 -0800

    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 <alan.coopersmith at oracle.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Tested-by: Simon Thum <simon.thum at gmx.de>

diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index a5adc01..fb5d49e 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)
 
commit 058b889fde47b4c32534f11ed651bf1749d1dbb2
Author: David Barksdale <david.barksdale at adcedosolutions.com>
Date:   Mon Dec 13 18:35:20 2010 -0800

    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 <alan.coopersmith at oracle.com>
    Signed-off-by: David Barksdale <david.barksdale at adcedosolutions.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
index 356d490..f60b8ed 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_]+$/)
commit 1324b0ca9f8a7fdaf03b374c75eb3c9df407c2f1
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Fri Dec 10 00:08:24 2010 +0000

    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 <alan.coopersmith at oracle.com>

diff --git a/os/xprintf.c b/os/xprintf.c
index 0a8bd06..254b737 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
 }