openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-23 10:10:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

f2fs-tools: fix build breakage

Browse Source 
Fix this first, and will do upstream right away.

Change-Id: I6debbb0988595772452f7a878c2cc177fa2e26f3
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
This commit is contained in:
Jaegeuk Kim 2019-02-27 14:29:09 -08:00 committed by Jaegeuk Kim
parent 22d758e2e6
commit 560f99942f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/f2fs_io/f2fs_io.c
View File

@ -25,6 +25,7 @@
#include <string.h>
#include <unistd.h>
#include <time.h>
#include <inttypes.h>
#include <string.h>
#include <signal.h>
#include <termios.h>
@ -155,7 +156,7 @@ static void do_pinfile(int argc, char **argv, const struct cmd_desc *cmd)
static void do_write(int argc, char **argv, const struct cmd_desc *cmd)
{
u64 buf_size = 0, inc_num = 0, ret = 0, written = 0;
loff_t offset;
u64 offset;
char *buf = NULL;
unsigned bs, count, i;
int flags = 0;
@ -219,7 +220,7 @@ static void do_write(int argc, char **argv, const struct cmd_desc *cmd)
written += ret;
}
printf("Written %lu bytes with pattern=%s\n", written, argv[4]);
printf("Written %"PRIu64" bytes with pattern=%s\n", written, argv[4]);
exit(0);
}
@ -234,7 +235,7 @@ static void do_write(int argc, char **argv, const struct cmd_desc *cmd)
static void do_read(int argc, char **argv, const struct cmd_desc *cmd)
{
u64 buf_size = 0, ret = 0, read_cnt = 0;
loff_t offset;
u64 offset;
char *buf = NULL;
char *print_buf = NULL;
unsigned bs, count, i, print_bytes;
@ -295,12 +296,12 @@ static void do_read(int argc, char **argv, const struct cmd_desc *cmd)
if (i == 0)
memcpy(print_buf, buf, print_bytes);
}
printf("Read %lu bytes and print %d bytes:\n", read_cnt, print_bytes);
printf("%08lx : ", offset);
printf("Read %"PRIu64" bytes and print %u bytes:\n", read_cnt, print_bytes);
printf("%08"PRIx64" : ", offset);
for (i = 1; i <= print_bytes; i++) {
printf("%02x", print_buf[i - 1]);
if (i % 16 == 0)
printf("\n%08lx : ", offset + 16 * i);
printf("\n%08"PRIx64" : ", offset + 16 * i);
else if (i % 2 == 0)
printf(" ");
}
@ -325,7 +326,7 @@ struct file_ext {
static void do_fiemap(int argc, char **argv, const struct cmd_desc *cmd)
{
loff_t offset;
u64 offset;
u32 blknum;
unsigned count, i;
int fd;
@ -345,7 +346,7 @@ static void do_fiemap(int argc, char **argv, const struct cmd_desc *cmd)
exit(1);
}
printf("Fiemap: offset = %08lx len = %d\n", offset, count);
printf("Fiemap: offset = %08"PRIx64" len = %d\n", offset, count);
for (i = 0; i < count; i++) {
blknum = offset + i;