summaryrefslogtreecommitdiffstats
path: root/fuse_sideload.c
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-03-23 23:00:50 +0100
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-23 23:00:50 +0100
commit30ad0461924096e948f4eef6f0e7cc64c28dac1a (patch)
treead1df5da827f51d31d05ce5d80d44e7488e25dc4 /fuse_sideload.c
parentam e944944f: Merge "Add "Apply update from sdcard" to default recovery image." (diff)
parentMerge "Always use strerror to report errno in recovery." (diff)
downloadandroid_bootable_recovery-30ad0461924096e948f4eef6f0e7cc64c28dac1a.tar
android_bootable_recovery-30ad0461924096e948f4eef6f0e7cc64c28dac1a.tar.gz
android_bootable_recovery-30ad0461924096e948f4eef6f0e7cc64c28dac1a.tar.bz2
android_bootable_recovery-30ad0461924096e948f4eef6f0e7cc64c28dac1a.tar.lz
android_bootable_recovery-30ad0461924096e948f4eef6f0e7cc64c28dac1a.tar.xz
android_bootable_recovery-30ad0461924096e948f4eef6f0e7cc64c28dac1a.tar.zst
android_bootable_recovery-30ad0461924096e948f4eef6f0e7cc64c28dac1a.zip
Diffstat (limited to 'fuse_sideload.c')
-rw-r--r--fuse_sideload.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fuse_sideload.c b/fuse_sideload.c
index 4e11e01e4..1dd84e97a 100644
--- a/fuse_sideload.c
+++ b/fuse_sideload.c
@@ -106,12 +106,12 @@ static void fuse_reply(struct fuse_data* fd, __u64 unique, const void *data, siz
vec[0].iov_base = &hdr;
vec[0].iov_len = sizeof(hdr);
- vec[1].iov_base = data;
+ vec[1].iov_base = /* const_cast */(void*)(data);
vec[1].iov_len = len;
res = writev(fd->ffd, vec, 2);
if (res < 0) {
- printf("*** REPLY FAILED *** %d\n", errno);
+ printf("*** REPLY FAILED *** %s\n", strerror(errno));
}
}
@@ -430,7 +430,7 @@ int run_fuse_sideload(struct provider_vtab* vtab, void* cookie,
char opts[256];
snprintf(opts, sizeof(opts),
- ("fd=%d,user_id=%d,group_id=%d,max_read=%zu,"
+ ("fd=%d,user_id=%d,group_id=%d,max_read=%u,"
"allow_other,rootmode=040000"),
fd.ffd, fd.uid, fd.gid, block_size);