diff options
| author | Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> | 2019-06-04 15:23:41 -0700 |
|---|---|---|
| committer | Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> | 2019-06-04 15:28:12 -0700 |
| commit | 04e8ff85959278748b76877ad23d838c87d01919 (patch) | |
| tree | 2b01d258c346491228d20a4b5926bca77ffcb817 /src/glx | |
| parent | 65439291a02066f0e18090f8ce9645a8a1ba97a4 (diff) | |
glx: Fix error message when no driverName is available
Just provide a "(null)" literal in case driverName is NULL.
In file included from ../src/glx/dri3_glx.c:76:
../src/glx/dri3_glx.c: In function ‘dri3_create_screen’:
../src/glx/dri_common.h:70:36: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
70 | #define CriticalErrorMessageF(...) dri_message(_LOADER_FATAL, __VA_ARGS__)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../src/glx/dri3_glx.c:1002:4: note: in expansion of macro ‘CriticalErrorMessageF’
1002 | CriticalErrorMessageF("failed to load driver: %s\n", driverName);
| ^~~~~~~~~~~~~~~~~~~~~
../src/glx/dri3_glx.c:1002:50: note: format string is defined here
1002 | CriticalErrorMessageF("failed to load driver: %s\n", driverName);
| ^~
cc1: some warnings being treated as errors
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/dri3_glx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index 8d5b9c2051e..796fc26d9dd 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -999,7 +999,7 @@ dri3_create_screen(int screen, struct glx_display * priv) return &psc->base; handle_error: - CriticalErrorMessageF("failed to load driver: %s\n", driverName); + CriticalErrorMessageF("failed to load driver: %s\n", driverName ? driverName : "(null)"); if (configs) glx_config_destroy_list(configs); |