diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-01-13 11:51:33 -0800 |
|---|---|---|
| committer | Greg Wallace <greg@gregtwallace.com> | 2016-01-19 22:02:21 -0500 |
| commit | bf12354581c7d1209db1c5cbcc58976039a217f8 (patch) | |
| tree | 96cf5f68cf100dbaa43b4492170630bd5c379a13 /lib | |
| parent | 54dabbe65c4c73172d02127402967fd2b9abf8ab (diff) | |
| download | android_external_f2fs-tools-bf12354581c7d1209db1c5cbcc58976039a217f8.tar.gz android_external_f2fs-tools-bf12354581c7d1209db1c5cbcc58976039a217f8.tar.bz2 android_external_f2fs-tools-bf12354581c7d1209db1c5cbcc58976039a217f8.zip | |
f2fs-tools: avoid failure and warnings for android build
This patch fixes to resolve build failure and warnings when compiling it
under AOSP.
Change-Id: I26f65615203183ad4d4c54c28fc152042707251b
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libf2fs.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/libf2fs.c b/lib/libf2fs.c index 8158514..57de047 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -96,7 +96,7 @@ int utf8_to_utf16(u_int16_t *output, const char *input, size_t outsize, u_int16_t *outp = output; wchar_t wc; - while (inp - input < insize && *inp) { + while ((size_t)(inp - input) < insize && *inp) { inp = utf8_to_wchar(inp, &wc, insize - (inp - input)); if (inp == NULL) { DBG(0, "illegal UTF-8 sequence\n"); @@ -182,7 +182,7 @@ int utf16_to_utf8(char *output, const u_int16_t *input, size_t outsize, char *outp = output; wchar_t wc; - while (inp - input < insize && le16_to_cpu(*inp)) { + while ((size_t)(inp - input) < insize && le16_to_cpu(*inp)) { inp = utf16_to_wchar(inp, &wc, insize - (inp - input)); if (inp == NULL) { DBG(0, "illegal UTF-16 sequence\n"); @@ -506,8 +506,7 @@ void f2fs_init_configuration(struct f2fs_configuration *c) c->ro = 0; } -static int is_mounted(struct f2fs_configuration *c, - const char *mpt, const char *device) +static int is_mounted(const char *mpt, const char *device) { #ifdef __linux__ FILE *file = NULL; @@ -519,8 +518,10 @@ static int is_mounted(struct f2fs_configuration *c, while ((mnt = getmntent(file)) != NULL) { if (!strcmp(device, mnt->mnt_fsname)) { +#ifdef MNTOPT_RO if (hasmntopt(mnt, MNTOPT_RO)) config.ro = 1; +#endif break; } } @@ -538,7 +539,7 @@ int f2fs_dev_is_umounted(struct f2fs_configuration *c) int ret = 0; #ifdef __linux__ - ret = is_mounted(c, MOUNTED, c->device_name); + ret = is_mounted(MOUNTED, c->device_name); if (ret) { MSG(0, "Info: Mounted device!\n"); return -1; @@ -549,7 +550,7 @@ int f2fs_dev_is_umounted(struct f2fs_configuration *c) * if failed due to /etc/mtab file not present * try with /proc/mounts. */ - ret = is_mounted(c, "/proc/mounts", c->device_name); + ret = is_mounted("/proc/mounts", c->device_name); if (ret) { MSG(0, "Info: Mounted device!\n"); return -1; |