aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Albershteyn <aalbersh@redhat.com>2023-05-16 12:23:03 +0200
committerZorro Lang <zlang@kernel.org>2023-05-28 02:03:49 +0800
commitdf0238186fe51b971aaec25371b4644753eab97c (patch)
tree1197773ae63f0dc1b0f4a29dc9053b9ed3066368
parent33144e0693b5d70c81e5cf142d02e5e6dd7bd5ce (diff)
downloadxfstests-dev-df0238186fe51b971aaec25371b4644753eab97c.tar.gz
fstests: fix compilation error in splice2pipe on old (<C99) compilers
Compilation fails on system with compiler which uses older C dialect (e.g. RHEL7; gcc with gnu90) with: splice2pipe.c: In function 'prepare_pipe': splice2pipe.c:54:2: error: 'for' loop initial declarations are only allowed in C99 mode for (unsigned r = pipe_size; r > 0;) { Fix it by declaring 'r' outside of the loop. Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rw-r--r--src/splice2pipe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/splice2pipe.c b/src/splice2pipe.c
index bd33ff6736..00b3a23af9 100644
--- a/src/splice2pipe.c
+++ b/src/splice2pipe.c
@@ -41,6 +41,7 @@
*/
static void prepare_pipe(int p[2])
{
+ unsigned int r = 0;
if (pipe(p)) {
perror("pipe failed");
abort();
@@ -51,7 +52,7 @@ static void prepare_pipe(int p[2])
/* fill the pipe completely; each pipe_buffer will now have
the PIPE_BUF_FLAG_CAN_MERGE flag */
- for (unsigned r = pipe_size; r > 0;) {
+ for (r = pipe_size; r > 0;) {
unsigned n = r > sizeof(buffer) ? sizeof(buffer) : r;
write(p[1], buffer, n);
r -= n;
@@ -59,7 +60,7 @@ static void prepare_pipe(int p[2])
/* drain the pipe, freeing all pipe_buffer instances (but
leaving the flags initialized) */
- for (unsigned r = pipe_size; r > 0;) {
+ for (r = pipe_size; r > 0;) {
unsigned n = r > sizeof(buffer) ? sizeof(buffer) : r;
read(p[0], buffer, n);
r -= n;