commit 8439dc9fd569794b1a31f67cf43d9212de33eecc
author Tim Murray <timmurray@google.com> Mon Dec 15 11:56:11 2014 -0800
committer Tim Murray <timmurray@google.com> Thu Dec 18 00:21:21 2014 +0000
tree e76ac976d7ffef325c2a5f91e8fdc379a028e3b8
parent a20bb17e4c6095a77425418d7eb0c1ceb50d05f7

Make vold compile with -Werror -Wall.

-Wno-missing-field-initializers is used as well, but that is an
overzealous warning from initializing structs with {0} and not a
real warning.

bug 18736778 and 16868177

Change-Id: Iffde89cd7200d9a11193e1614f1819f9fcace30a

Volume.cpp

diff --git a/Volume.cpp b/Volume.cpp
index bfad29d..75cc4c1 100644
--- a/Volume.cpp
+++ b/Volume.cpp
@@ -332,7 +332,7 @@
 
 int Volume::mountVol() {
     dev_t deviceNodes[4];
-    int n, i, rc = 0;
+    int n, i;
     char errmsg[255];
 
     int flags = getFlags();
@@ -454,7 +454,6 @@
         }
 
         errno = 0;
-        int gid;
 
         if (Fat::doMount(devicePath, getMountpoint(), false, false, false,
                 AID_MEDIA_RW, AID_MEDIA_RW, 0007, true)) {
@@ -549,8 +548,6 @@
 }
 
 int Volume::unmountVol(bool force, bool revert) {
-    int i, rc;
-
     int flags = getFlags();
     bool providesAsec = (flags & VOL_PROVIDES_ASEC) != 0;