[PATCH xserver] sdksyms: Skip empty symbols

Peter Hutterer peter.hutterer at who-t.net
Thu Apr 12 03:00:54 UTC 2018


On Wed, Apr 11, 2018 at 03:39:33PM -0400, Adam Jackson wrote:
> Apparently on NetBSD we can hit failures like this:
> 
> sdksyms.c:1773:15: error: expected expression before ',' token
>      (void *) &,                                                  /* ../../dri3/dri3.h:110 */
> 
> I've been unable to reproduce that locally (even in a NetBSD vm), but
> an obvious workaround might be to just notice empty symbol names and
> ignore them rather than emit invalid C code.
> 
> Cc: Thomas Klausner <wiz at netbsd.org>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  hw/xfree86/sdksyms.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
> index d927fcd165..fc171d9188 100755
> --- a/hw/xfree86/sdksyms.sh
> +++ b/hw/xfree86/sdksyms.sh
> @@ -415,7 +415,8 @@ BEGIN {
>  	sub(/[^a-zA-Z0-9_].*/, "", symbol);
>  
>  	#print;
> -	printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
> +	if (symbol != "")

my awk skills are non-existent but shouldn't this be $symbol? The condition a few
lines above uses $n == "" instead of n == ""

with that change, Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
   Peter

> +	    printf("    (void *) &%-50s /* %s:%s */\n", symbol ",", header, line);
>      }
>  }
>  
> -- 
> 2.17.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
> 


More information about the xorg-devel mailing list