blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wlr_linux_dmabuf: Fix printf conversion specifiers on armhf 

The printf conversion specifiers in a call to wl_resource_post_error
do not specify the type correctly on armhf:

../types/wlr_linux_dmabuf.c: In function 'params_add':
../types/wlr_linux_dmabuf.c:104:21: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}' [-Werror=format=]
    "sent modifier %lu for plane %u, expected modifier %lu like other planes",
                   ~~^
                   %llu

To fix this, we use standard printf conversion specifier macros from
inttypes.h.
This commit is contained in:
Bob Ham 2018-06-04 13:20:09 +00:00
parent caf72767a1
commit eb8b8acca6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
types/wlr_linux_dmabuf.c
View File

@ -101,7 +101,8 @@ static void params_add(struct wl_client *client,
if (buffer->has_modifier && modifier != buffer->attributes.modifier) { if (buffer->has_modifier && modifier != buffer->attributes.modifier) {
wl_resource_post_error(params_resource, wl_resource_post_error(params_resource,
ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_FORMAT, ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_FORMAT,
"sent modifier %lu for plane %u, expected modifier %lu like other planes", "sent modifier %" PRIu64 " for plane %u, expected"
" modifier %" PRIu64 " like other planes",
modifier, plane_idx, buffer->attributes.modifier); modifier, plane_idx, buffer->attributes.modifier);
close(fd); close(fd);
return; return;