[Intel-gfx] [PATCH i-g-t 3/4] core: Only display the errno message if errno is set

Daniel Vetter daniel at ffwll.ch
Wed Jul 9 13:57:59 CEST 2014


On Wed, Jul 09, 2014 at 11:45:20AM +0100, Damien Lespiau wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
> ---
>  lib/igt_core.c | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/igt_core.c b/lib/igt_core.c
> index 4dbcb1a..e66d096 100644
> --- a/lib/igt_core.c
> +++ b/lib/igt_core.c
> @@ -575,6 +575,10 @@ void __igt_skip_check(const char *file, const int line,
>  {
>  	va_list args;
>  	int err = errno;
> +	char *err_str = NULL;
> +
> +	if (err)
> +		asprintf(&err_str, "Last errno: %i, %s\n", err, strerror(err));
>  
>  	if (f) {
>  		static char *buf;
> @@ -589,16 +593,18 @@ void __igt_skip_check(const char *file, const int line,
>  
>  		igt_skip("Test requirement not met in function %s, file %s:%i:\n"
>  			 "Test requirement: (%s)\n%s"
> -			 "Last errno: %i, %s\n",
> -			 func, file, line, check, buf, err, strerror(err));
> +			 "%s",
> +			 func, file, line, check, buf, err_str ?: "");
>  
>  		free(buf);
>  	} else {
>  		igt_skip("Test requirement not met in function %s, file %s:%i:\n"
>  			 "Test requirement: (%s)\n"
> -			 "Last errno: %i, %s\n",
> -			 func, file, line, check, err, strerror(err));
> +			 "%s",
> +			 func, file, line, check, err_str ?: "");
>  	}
> +
> +	free(err_str);

Same issue about dead code. But I like the idea.
-Daniel

>  }
>  
>  /**
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch



More information about the Intel-gfx mailing list