diff options
| author | Keith Packard <keithp@keithp.com> | 2010-12-20 00:48:45 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-12-20 00:48:45 -0800 |
| commit | e7dc253452a1ba64718a08fdc070405b494f53cd (patch) | |
| tree | f8923b6aa89b68d3ae82e23f10e8ec5bb1be1f29 | |
| parent | d1107918d4626268803b54033a07405122278e7f (diff) | |
| parent | d5b0d58573ffb90ea70273cd013102168fd2a18a (diff) | |
Merge remote branch 'alanc/master'
| -rwxr-xr-x | hw/xfree86/loader/sdksyms.sh | 6 | ||||
| -rw-r--r-- | hw/xfree86/parser/Makefile.am | 2 | ||||
| -rw-r--r-- | os/xprintf.c | 2 |
3 files changed, 7 insertions, 3 deletions
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_]+$/) 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) 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 } |