Commits

Kenny Root  committed bacdfc0 Merge

Merge "Fix compiling warnings"

  • Participants
  • Parent commits 16a3250, 7929deb

Comments (0)

Files changed (5)

File Devmapper.cpp

     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();
     }
 #include <sys/mount.h>
 
 #include <linux/kdev_t.h>
-#include <linux/fs.h>
 
 #define LOG_TAG "Vold"
 
 #include <sys/mount.h>
 
 #include <linux/kdev_t.h>
-#include <linux/fs.h>
 
 #define LOG_TAG "Vold"
 
 #include <sys/param.h>
 
 #include <linux/kdev_t.h>
-#include <linux/fs.h>
 
 #include <cutils/properties.h>
 
 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;