summaryrefslogtreecommitdiff
path: root/apps/examples/nxffs
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-02-10 19:11:56 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-02-10 19:11:56 -0600
commit797e41438176de465272bef182e035cd0fe5884a (patch)
tree3af4825ad5b2c3bd579305d025c35d6a3b96c9a1 /apps/examples/nxffs
parent6db1f6f71c8867cbae3a2c5597b01f321064a370 (diff)
downloadpx4-nuttx-797e41438176de465272bef182e035cd0fe5884a.tar.gz
px4-nuttx-797e41438176de465272bef182e035cd0fe5884a.tar.bz2
px4-nuttx-797e41438176de465272bef182e035cd0fe5884a.zip
More changes to reduce complaints from CppCheck. Some latent bugs fixes, but probably some new typos introduced
Diffstat (limited to 'apps/examples/nxffs')
-rw-r--r--apps/examples/nxffs/nxffs_main.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/apps/examples/nxffs/nxffs_main.c b/apps/examples/nxffs/nxffs_main.c
index a52afea39..154714246 100644
--- a/apps/examples/nxffs/nxffs_main.c
+++ b/apps/examples/nxffs/nxffs_main.c
@@ -370,10 +370,11 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file)
message("ERROR: Failed to write file: %d\n", err);
message(" File name: %s\n", file->name);
message(" File size: %d\n", file->len);
- message(" Write offset: %d\n", offset);
- message(" Write size: %d\n", nbytestowrite);
+ message(" Write offset: %ld\n", (long)offset);
+ message(" Write size: %ld\n", (long)nbytestowrite);
ret = ERROR;
}
+
close(fd);
/* Remove any garbage file that might have been left behind */
@@ -398,10 +399,11 @@ static inline int nxffs_wrfile(FAR struct nxffs_filedesc_s *file)
message("ERROR: Partial write:\n");
message(" File name: %s\n", file->name);
message(" File size: %d\n", file->len);
- message(" Write offset: %d\n", offset);
- message(" Write size: %d\n", nbytestowrite);
- message(" Written: %d\n", nbyteswritten);
+ message(" Write offset: %ld\n", (long)offset);
+ message(" Write size: %ld\n", (long)nbytestowrite);
+ message(" Written: %ld\n", (long)nbyteswritten);
}
+
offset += nbyteswritten;
}
@@ -466,8 +468,8 @@ static ssize_t nxffs_rdblock(int fd, FAR struct nxffs_filedesc_s *file,
message("ERROR: Failed to read file: %d\n", errno);
message(" File name: %s\n", file->name);
message(" File size: %d\n", file->len);
- message(" Read offset: %d\n", offset);
- message(" Read size: %d\n", len);
+ message(" Read offset: %ld\n", (long)offset);
+ message(" Read size: %ld\n", (long)len);
return ERROR;
}
else if (nbytesread == 0)
@@ -476,8 +478,8 @@ static ssize_t nxffs_rdblock(int fd, FAR struct nxffs_filedesc_s *file,
message("ERROR: Unexpected end-of-file:\n");
message(" File name: %s\n", file->name);
message(" File size: %d\n", file->len);
- message(" Read offset: %d\n", offset);
- message(" Read size: %d\n", len);
+ message(" Read offset: %ld\n", (long)offset);
+ message(" Read size: %ld\n", (long)len);
#endif
return ERROR;
}
@@ -486,9 +488,9 @@ static ssize_t nxffs_rdblock(int fd, FAR struct nxffs_filedesc_s *file,
message("ERROR: Partial read:\n");
message(" File name: %s\n", file->name);
message(" File size: %d\n", file->len);
- message(" Read offset: %d\n", offset);
- message(" Read size: %d\n", len);
- message(" Bytes read: %d\n", nbytesread);
+ message(" Read offset: %ld\n", (long)offset);
+ message(" Read size: %ld\n", (long)len);
+ message(" Bytes read: %ld\n", (long)nbytesread);
}
return nbytesread;
}
@@ -857,8 +859,8 @@ int nxffs_main(int argc, char *argv[])
* (hopefully that the file system is full)
*/
- message("\n=== FILLING %d =============================\n", i);
- ret = nxffs_fillfs();
+ message("\n=== FILLING %u =============================\n", i);
+ (void)nxffs_fillfs();
message("Filled file system\n");
message(" Number of files: %d\n", g_nfiles);
message(" Number deleted: %d\n", g_ndeleted);
@@ -888,7 +890,7 @@ int nxffs_main(int argc, char *argv[])
/* Delete some files */
- message("\n=== DELETING %d ============================\n", i);
+ message("\n=== DELETING %u ============================\n", i);
ret = nxffs_delfiles();
if (ret < 0)
{