This is an automated email from the ASF dual-hosted git repository.
liuhaitao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 4109f0e examples/media: Fix the compiler wanring after off_t type
change
4109f0e is described below
commit 4109f0e8ba12ce22bd017032a441dce4c30aae27
Author: Xiang Xiao <[email protected]>
AuthorDate: Fri Jul 23 12:03:12 2021 +0800
examples/media: Fix the compiler wanring after off_t type change
Signed-off-by: Xiang Xiao <[email protected]>
---
examples/media/media_main.c | 42 +++++++++++++++++++++++++++---------------
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/examples/media/media_main.c b/examples/media/media_main.c
index 69a8fe2..d606efd 100644
--- a/examples/media/media_main.c
+++ b/examples/media/media_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/examples/media/hello_main.c
+ * apps/examples/media/media_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -185,7 +185,7 @@ int main(int argc, FAR char *argv[])
for (blockno = 0; info.nblocks == 0 || blockno < info.nblocks; blockno++)
{
- printf("Write/Verify: Block %lu\n", (unsigned long)blockno);
+ printf("Write/Verify: Block %ju\n", (uintmax_t)blockno);
/* Fill buffer with a (possibly) unique pattern */
@@ -205,7 +205,8 @@ int main(int argc, FAR char *argv[])
fprintf(stderr, "ERROR: lseek to %ju failed: %d\n",
(uintmax_t)pos, errcode);
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -213,7 +214,8 @@ int main(int argc, FAR char *argv[])
{
fprintf(stderr, "ERROR: lseek failed: %ju vs %ju\n",
(uintmax_t)seekpos, (uintmax_t) pos);
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -226,7 +228,8 @@ int main(int argc, FAR char *argv[])
fprintf(stderr, "ERROR: write failed: %d\n", errcode);
if (errno != EINTR)
{
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -235,7 +238,8 @@ int main(int argc, FAR char *argv[])
{
fprintf(stderr, "ERROR: Unexpected write size: %lu vs. %lu\n",
(unsigned long)nwritten, (unsigned long)info.blocksize);
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -247,7 +251,8 @@ int main(int argc, FAR char *argv[])
fprintf(stderr, "ERROR: lseek to %ju failed: %d\n",
(uintmax_t)pos, errcode);
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -255,7 +260,8 @@ int main(int argc, FAR char *argv[])
{
fprintf(stderr, "ERROR: lseek failed: %ju vs %ju\n",
(uintmax_t)seekpos, (uintmax_t)pos);
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -268,7 +274,8 @@ int main(int argc, FAR char *argv[])
fprintf(stderr, "ERROR: read failed: %d\n", errcode);
if (errno != EINTR)
{
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -277,7 +284,8 @@ int main(int argc, FAR char *argv[])
{
fprintf(stderr, "ERROR: Unexpected read size: %lu vs. %lu\n",
(unsigned long)nread, (unsigned long)info.blocksize);
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -298,7 +306,8 @@ int main(int argc, FAR char *argv[])
if (nerrors > 100)
{
fprintf(stderr, "ERROR: Too many errors\n");
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
@@ -335,7 +344,7 @@ int main(int argc, FAR char *argv[])
for (blockno = 0; blockno < info.nblocks; blockno++)
{
- printf("Re-read/Verify: Block %lu\n", (unsigned long)blockno);
+ printf("Re-read/Verify: Block %ju\n", (uintmax_t)blockno);
/* Fill buffer with a (possibly) unique pattern */
@@ -356,7 +365,8 @@ int main(int argc, FAR char *argv[])
fprintf(stderr, "ERROR: read failed: %d\n", errcode);
if (errno != EINTR)
{
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
break;
}
}
@@ -364,7 +374,8 @@ int main(int argc, FAR char *argv[])
{
fprintf(stderr, "ERROR: Unexpected read size: %lu vs. %lu\n",
(unsigned long)nread, (unsigned long)info.blocksize);
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
break;
}
else
@@ -384,7 +395,8 @@ int main(int argc, FAR char *argv[])
if (nerrors > 100)
{
fprintf(stderr, "ERROR: Too many errors\n");
- fprintf(stderr, "ERROR: Aborting at block: %lu\n", blockno);
+ fprintf(stderr, "ERROR: Aborting at block: %ju\n",
+ (uintmax_t)blockno);
info.nblocks = blockno;
break;
}
