From c65d37e4ac64e86f9570bd9aa9272a3915da136c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 7 Mar 2024 15:09:44 -0500 Subject: [PATCH] ply-buffer: Fix unused-value warning We currently get warnings during the build like ``` ../src/libply/ply-buffer.h:60:20: warning: value computed is not used [-Wunused-value] 60 | !_ran && (*bytes = (char *) ply_buffer_get_bytes(buffer), | ^~ ``` This commit changes the macro to use a GCC statement expression with an if statement to work around the warning. Closes: https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/246 --- src/libply/ply-buffer.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libply/ply-buffer.h b/src/libply/ply-buffer.h index 2140e44d..7b8220a9 100644 --- a/src/libply/ply-buffer.h +++ b/src/libply/ply-buffer.h @@ -57,10 +57,14 @@ size_t ply_buffer_get_capacity (ply_buffer_t *buffer); char *ply_buffer_steal_bytes (ply_buffer_t *buffer); #define ply_buffer_borrow_bytes(buffer, bytes, size, capacity) \ for (bool _ran = false; \ - !_ran && (*bytes = (char *) ply_buffer_get_bytes (buffer), \ - *size = ply_buffer_get_size (buffer), \ - *capacity = ply_buffer_get_capacity (buffer)), \ - !_ran; \ + ({ \ + if (!_ran) { \ + *bytes = (char *) ply_buffer_get_bytes (buffer); \ + *size = ply_buffer_get_size (buffer); \ + *capacity = ply_buffer_get_capacity (buffer); \ + } \ + !_ran; \ + }); \ ply_buffer_set_bytes (buffer, *bytes, *size, *capacity), \ _ran = true, \ *bytes = NULL, \ -- 2.47.3