am bacdfc0e: Merge "Fix compiling warnings"

* commit 'bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3':
  Fix compiling warnings
This commit is contained in:
Kenny Root 2013-02-27 17:59:01 +00:00 committed by Android Git Automerger
commit 286374f166
5 changed files with 2 additions and 5 deletions

View file

@ -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();
}

View file

@ -32,7 +32,6 @@
#include <sys/wait.h>
#include <linux/kdev_t.h>
#include <linux/fs.h>
#define LOG_TAG "Vold"

View file

@ -32,7 +32,6 @@
#include <sys/wait.h>
#include <linux/kdev_t.h>
#include <linux/fs.h>
#define LOG_TAG "Vold"

View file

@ -28,7 +28,6 @@
#include <sys/param.h>
#include <linux/kdev_t.h>
#include <linux/fs.h>
#include <cutils/properties.h>

2
vdc.c
View file

@ -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;