[Mesa-dev] [PATCH] st/xvmc/tests: avoid non portable error.h functions

Christian König deathsimple at vodafone.de
Wed Jun 26 00:13:13 PDT 2013


Am 26.06.2013 09:10, schrieb Jonathan Gray:
> Signed-off-by: Jonathan Gray <jsg at jsg.id.au>

Looks good on first glance, patch is:

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   src/gallium/state_trackers/xvmc/tests/xvmc_bench.c | 13 ++++++++-----
>   1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git src/gallium/state_trackers/xvmc/tests/xvmc_bench.c src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
> index fe85802..37360a6 100644
> --- src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
> +++ src/gallium/state_trackers/xvmc/tests/xvmc_bench.c
> @@ -28,7 +28,7 @@
>   #include <assert.h>
>   #include <stdio.h>
>   #include <string.h>
> -#include <error.h>
> +#include <stdlib.h>
>   #include <sys/time.h>
>   #include "testlib.h"
>   
> @@ -144,9 +144,9 @@ void ParseArgs(int argc, char **argv, struct Config *config)
>   	}
>   
>   	if (fail)
> -		error
> -		(
> -			1, 0,
> +	{
> +		fprintf(
> +			stderr,
>   			"Bad argument.\n"
>   			"\n"
>   			"Usage: %s [options]\n"
> @@ -161,6 +161,8 @@ void ParseArgs(int argc, char **argv, struct Config *config)
>   			"\tMB types: i,p,b\n",
>   			argv[0]
>   		);
> +		exit(1);
> +	}
>   
>   	if (config->output_width == 0)
>   		config->output_width = config->input_width;
> @@ -214,7 +216,8 @@ int main(int argc, char **argv)
>   	))
>   	{
>   		XCloseDisplay(display);
> -		error(1, 0, "Error, unable to find a good port.\n");
> +		fprintf(stderr, "Error, unable to find a good port.\n");
> +		exit(1);
>   	}
>   
>   	if (is_overlay)



More information about the mesa-dev mailing list