mirror of
https://gitlab.freedesktop.org/monado/monado.git
synced 2025-02-06 22:08:09 +00:00
d/wmr: don't print NULL value in error message
In file included from ../src/xrt/drivers/wmr/wmr_config.h:15, from ../src/xrt/drivers/wmr/wmr_config.c:16: In function ‘wmr_config_parse_camera_config’, inlined from ‘wmr_config_parse_calibration’ at ../src/xrt/drivers/wmr/wmr_config.c:422:8, inlined from ‘wmr_hmd_config_parse’ at ../src/xrt/drivers/wmr/wmr_config.c:477:13: ../src/xrt/auxiliary/util/u_logging.h:84:25: warning: ‘%s’ directive argument is null [-Wformat-overflow=] 84 | u_log(__FILE__, __LINE__, __func__, level, __VA_ARGS__); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/xrt/auxiliary/util/u_logging.h:220:38: note: in expansion of macro ‘U_LOG_IFL’ 220 | #define U_LOG_IFL_E(cond_level, ...) U_LOG_IFL(U_LOGGING_ERROR, cond_level, __VA_ARGS__) | ^~~~~~~~~ ../src/xrt/drivers/wmr/wmr_config.c:22:35: note: in expansion of macro ‘U_LOG_IFL_E’ 22 | #define WMR_ERROR(log_level, ...) U_LOG_IFL_E(log_level, __VA_ARGS__) | ^~~~~~~~~~~ ../src/xrt/drivers/wmr/wmr_config.c:267:17: note: in expansion of macro ‘WMR_ERROR’ 267 | WMR_ERROR(log_level, "Invalid camera calibration block %d - unknown camera purpose %s", c->n_cameras, | ^~~~~~~~~ ../src/xrt/drivers/wmr/wmr_config.c: In function ‘wmr_hmd_config_parse’: ../src/xrt/drivers/wmr/wmr_config.c:267:100: note: format string is defined here 267 | WMR_ERROR(log_level, "Invalid camera calibration block %d - unknown camera purpose %s", c->n_cameras, | ^~
This commit is contained in:
parent
42ae21d412
commit
2b101e6ffa
|
@ -264,8 +264,7 @@ wmr_config_parse_camera_config(struct wmr_hmd_config *c, cJSON *camera, enum u_l
|
|||
cJSON *json_purpose = cJSON_GetObjectItem(camera, "Purpose");
|
||||
char *json_purpose_name = cJSON_GetStringValue(json_purpose);
|
||||
if (json_purpose_name == NULL) {
|
||||
WMR_ERROR(log_level, "Invalid camera calibration block %d - unknown camera purpose %s", c->n_cameras,
|
||||
json_purpose_name);
|
||||
WMR_ERROR(log_level, "Invalid camera calibration block %d - camera purpose not found", c->n_cameras);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue