summaryrefslogtreecommitdiffstats
path: root/fuse_sideload.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2015-07-24 20:58:41 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-24 20:58:41 +0200
commitef37ee0457016d533112706b54aab5eaed0944a0 (patch)
tree9afd779a06fddad908541f1ee53c727c800c4b5a /fuse_sideload.cpp
parentapplypatch: Support flash mode. (diff)
parentrecovery: Switch fuse_* to C++. (diff)
downloadandroid_bootable_recovery-ef37ee0457016d533112706b54aab5eaed0944a0.tar
android_bootable_recovery-ef37ee0457016d533112706b54aab5eaed0944a0.tar.gz
android_bootable_recovery-ef37ee0457016d533112706b54aab5eaed0944a0.tar.bz2
android_bootable_recovery-ef37ee0457016d533112706b54aab5eaed0944a0.tar.lz
android_bootable_recovery-ef37ee0457016d533112706b54aab5eaed0944a0.tar.xz
android_bootable_recovery-ef37ee0457016d533112706b54aab5eaed0944a0.tar.zst
android_bootable_recovery-ef37ee0457016d533112706b54aab5eaed0944a0.zip
Diffstat (limited to '')
-rw-r--r--fuse_sideload.cpp (renamed from fuse_sideload.c)15
1 files changed, 6 insertions, 9 deletions
diff --git a/fuse_sideload.c b/fuse_sideload.cpp
index 48e6cc53a..9c3e75f89 100644
--- a/fuse_sideload.c
+++ b/fuse_sideload.cpp
@@ -116,7 +116,7 @@ static void fuse_reply(struct fuse_data* fd, __u64 unique, const void *data, siz
}
static int handle_init(void* data, struct fuse_data* fd, const struct fuse_in_header* hdr) {
- const struct fuse_init_in* req = data;
+ const struct fuse_init_in* req = reinterpret_cast<const struct fuse_init_in*>(data);
struct fuse_init_out out;
size_t fuse_struct_size;
@@ -170,8 +170,7 @@ static void fill_attr(struct fuse_attr* attr, struct fuse_data* fd,
attr->mode = mode;
}
-static int handle_getattr(void* data, struct fuse_data* fd, const struct fuse_in_header* hdr) {
- const struct fuse_getattr_in* req = data;
+static int handle_getattr(void* /* data */, struct fuse_data* fd, const struct fuse_in_header* hdr) {
struct fuse_attr_out out;
memset(&out, 0, sizeof(out));
out.attr_valid = 10;
@@ -197,12 +196,12 @@ static int handle_lookup(void* data, struct fuse_data* fd,
out.entry_valid = 10;
out.attr_valid = 10;
- if (strncmp(FUSE_SIDELOAD_HOST_FILENAME, data,
+ if (strncmp(FUSE_SIDELOAD_HOST_FILENAME, reinterpret_cast<const char*>(data),
sizeof(FUSE_SIDELOAD_HOST_FILENAME)) == 0) {
out.nodeid = PACKAGE_FILE_ID;
out.generation = PACKAGE_FILE_ID;
fill_attr(&(out.attr), fd, PACKAGE_FILE_ID, fd->file_size, S_IFREG | 0444);
- } else if (strncmp(FUSE_SIDELOAD_HOST_EXIT_FLAG, data,
+ } else if (strncmp(FUSE_SIDELOAD_HOST_EXIT_FLAG, reinterpret_cast<const char*>(data),
sizeof(FUSE_SIDELOAD_HOST_EXIT_FLAG)) == 0) {
out.nodeid = EXIT_FLAG_ID;
out.generation = EXIT_FLAG_ID;
@@ -215,9 +214,7 @@ static int handle_lookup(void* data, struct fuse_data* fd,
return (out.nodeid == EXIT_FLAG_ID) ? NO_STATUS_EXIT : NO_STATUS;
}
-static int handle_open(void* data, struct fuse_data* fd, const struct fuse_in_header* hdr) {
- const struct fuse_open_in* req = data;
-
+static int handle_open(void* /* data */, struct fuse_data* fd, const struct fuse_in_header* hdr) {
if (hdr->nodeid == EXIT_FLAG_ID) return -EPERM;
if (hdr->nodeid != PACKAGE_FILE_ID) return -ENOENT;
@@ -292,7 +289,7 @@ static int fetch_block(struct fuse_data* fd, uint32_t block) {
}
static int handle_read(void* data, struct fuse_data* fd, const struct fuse_in_header* hdr) {
- const struct fuse_read_in* req = data;
+ const struct fuse_read_in* req = reinterpret_cast<const struct fuse_read_in*>(data);
struct fuse_out_header outhdr;
struct iovec vec[3];
int vec_used;