commit bacdfc0ed9a0882ee3e9ee889a8fd4cabb9a71f3
author Kenny Root <kroot@android.com> Wed Feb 27 16:57:14 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 27 16:57:15 2013 +0000
tree e0c31bf436958ff16224f6ae982346dc1f00e8f6
parent 16a32502bf98b4b0fc15a82a36242fada29baf5b
parent 7929deb206d8c04801deb4a26232f83a55e6fd32

Merge "Fix compiling warnings"

Devmapper.cpp

diff --git a/Devmapper.cpp b/Devmapper.cpp
index 7c11d12..6f43ac0 100644
--- a/Devmapper.cpp
+++ b/Devmapper.cpp
@@ -124,7 +124,7 @@
     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();
     }

Ext4.cpp

diff --git a/Ext4.cpp b/Ext4.cpp
index 4ec0616..613d623 100644
--- a/Ext4.cpp
+++ b/Ext4.cpp
@@ -31,7 +31,6 @@
 #include <sys/mount.h>
 
 #include <linux/kdev_t.h>
-#include <linux/fs.h>
 
 #define LOG_TAG "Vold"
 

Fat.cpp

diff --git a/Fat.cpp b/Fat.cpp
index 82a3f7a..a7fcc28 100644
--- a/Fat.cpp
+++ b/Fat.cpp
@@ -31,7 +31,6 @@
 #include <sys/mount.h>
 
 #include <linux/kdev_t.h>
-#include <linux/fs.h>
 
 #define LOG_TAG "Vold"
 

Volume.cpp

diff --git a/Volume.cpp b/Volume.cpp
index 0be2e81..4a00ccc 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -28,7 +28,6 @@
 #include <sys/param.h>
 
 #include <linux/kdev_t.h>
-#include <linux/fs.h>
 
 #include <cutils/properties.h>
 

vdc.c

diff --git a/vdc.c b/vdc.c
index 7dad143..59f34d6 100644
--- a/vdc.c
+++ b/vdc.c
@@ -57,7 +57,7 @@
 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;