summaryrefslogtreecommitdiff
path: root/libacryl/acrylic_layer.cpp
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2023-03-31 17:54:40 -0700
committerColin Cross <ccross@android.com>2023-04-10 13:19:30 -0700
commit1d1544b52c5c156b82dc31ae4be6ae62efb2d661 (patch)
treed593aa6fc0337455a95756f24fffa3fbd85618d4 /libacryl/acrylic_layer.cpp
parent775f35376eb847cb4ccb12fa9880885a18ab0171 (diff)
Fix formatting when _FILE_OFFSET_BITS=64
_FILE_OFFSET_BITS=64 can change off_t to be larger than a long. Cast to intmax_t and print with %jd or switch to ptrdiff_t and print with %td. Bug: 275601166 Test: builds Change-Id: I011cc53f108aaa7f773b0d09511728864f602429
Diffstat (limited to 'libacryl/acrylic_layer.cpp')
-rw-r--r--libacryl/acrylic_layer.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/libacryl/acrylic_layer.cpp b/libacryl/acrylic_layer.cpp
index b90d541..5c587fc 100644
--- a/libacryl/acrylic_layer.cpp
+++ b/libacryl/acrylic_layer.cpp
@@ -140,7 +140,8 @@ bool AcrylicCanvas::setImageBuffer(int fd[MAX_HW2D_PLANES], size_t len[MAX_HW2D_
for (int i = 0; i < num_buffers; i++) {
if ((offset[i] < 0) || (static_cast<size_t>(offset[i]) >= len[i])) {
- ALOGE("Too large offset %ld for length %zu of buffer[%d]", offset[i], len[i], i);
+ ALOGE("Too large offset %jd for length %zu of buffer[%d]",
+ static_cast<intmax_t>(offset[i]), len[i], i);
return false;
}
@@ -155,8 +156,8 @@ bool AcrylicCanvas::setImageBuffer(int fd[MAX_HW2D_PLANES], size_t len[MAX_HW2D_
m.mBufferFd[i] = fd[i];
mBufferLength[i] = len[i];
mBufferOffset[i] = offset[i];
- ALOGD_TEST("Configured buffer[%d]: fd %d, len %zu, offset %u (type: %s)",
- i, m.mBufferFd[i], mBufferLength[i], mBufferOffset[i],
+ ALOGD_TEST("Configured buffer[%d]: fd %d, len %zu, offset %jd (type: %s)", i,
+ m.mBufferFd[i], mBufferLength[i], static_cast<intmax_t>(mBufferOffset[i]),
canvasTypeName(mCanvasType));
}