Merge "Fix compiling warnings"
This commit is contained in:
commit
bacdfc0ed9
5 changed files with 2 additions and 5 deletions
|
@ -124,7 +124,7 @@ void Devmapper::ioctlInit(struct dm_ioctl *io, size_t dataSize,
|
|||
io->version[2] = 0;
|
||||
io->flags = flags;
|
||||
if (name) {
|
||||
int ret = strlcpy(io->name, name, sizeof(io->name));
|
||||
size_t ret = strlcpy(io->name, name, sizeof(io->name));
|
||||
if (ret >= sizeof(io->name))
|
||||
abort();
|
||||
}
|
||||
|
|
1
Ext4.cpp
1
Ext4.cpp
|
@ -31,7 +31,6 @@
|
|||
#include <sys/mount.h>
|
||||
|
||||
#include <linux/kdev_t.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
#define LOG_TAG "Vold"
|
||||
|
||||
|
|
1
Fat.cpp
1
Fat.cpp
|
@ -31,7 +31,6 @@
|
|||
#include <sys/mount.h>
|
||||
|
||||
#include <linux/kdev_t.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
#define LOG_TAG "Vold"
|
||||
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
#include <sys/param.h>
|
||||
|
||||
#include <linux/kdev_t.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
#include <cutils/properties.h>
|
||||
|
||||
|
|
2
vdc.c
2
vdc.c
|
@ -57,7 +57,7 @@ int main(int argc, char **argv) {
|
|||
static int do_cmd(int sock, int argc, char **argv) {
|
||||
char final_cmd[255] = "0 "; /* 0 is a (now required) sequence number */
|
||||
int i;
|
||||
int ret;
|
||||
size_t ret;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
char *cmp;
|
||||
|
|
Loading…
Reference in a new issue