diff options
| author | Bob Ham <bob.ham@puri.sm> | 2018-06-04 13:20:09 +0000 |
|---|---|---|
| committer | Bob Ham <bob.ham@puri.sm> | 2018-06-04 13:20:09 +0000 |
| commit | eb8b8acca6ea8a440da548c3bee82ac01eb8c99e (patch) | |
| tree | 1aeddc233d7a91fc2ad436351a4531dac824a86d | |
| parent | caf72767a199bf8761c8528d46bb832a16eefe59 (diff) | |
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.
| -rw-r--r-- | types/wlr_linux_dmabuf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/types/wlr_linux_dmabuf.c b/types/wlr_linux_dmabuf.c index 6e716986..3b4fc78b 100644 --- a/types/wlr_linux_dmabuf.c +++ b/types/wlr_linux_dmabuf.c @@ -101,7 +101,8 @@ static void params_add(struct wl_client *client, if (buffer->has_modifier && modifier != buffer->attributes.modifier) { wl_resource_post_error(params_resource, 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); close(fd); return; |