commit 99d9fb15b4a1eb534261ae81b2cf25aec4447bd0
author Chih-Hung Hsieh <chh@google.com> Thu Sep 11 14:44:46 2014 -0700
committer Chih-Hung Hsieh <chh@google.com> Thu Sep 11 16:57:59 2014 -0700
tree 708b78b61a27b6505ae1327811e29836b87096e9
parent 7d587c31d5c9a2f76f69073036f521dc75045656

Fix warnings on unused variables and parameters.

BUG: 17474723
Change-Id: If40f5e765090cfb970e4129b78b1e74cf8bad217

cmds/installd/utils.c

diff --git a/cmds/installd/utils.c b/cmds/installd/utils.c
index 8cd1168..dbff7c5 100644
--- a/cmds/installd/utils.c
+++ b/cmds/installd/utils.c
@@ -163,7 +163,7 @@
 int create_move_path(char path[PKG_PATH_MAX],
     const char* pkgname,
     const char* leaf,
-    userid_t userid)
+    userid_t userid __unused)
 {
     if ((android_data_dir.len + strlen(PRIMARY_USER_PREFIX) + strlen(pkgname) + strlen(leaf) + 1)
             >= PKG_PATH_MAX) {
@@ -239,7 +239,7 @@
         }
 
         if (de->d_type == DT_DIR) {
-            int r, subfd;
+            int subfd;
             DIR *subdir;
 
                 /* always skip "." and ".." */
@@ -783,7 +783,7 @@
 
 void finish_cache_collection(cache_t* cache)
 {
-    size_t i;
+    CACHE_NOISY(size_t i;)
 
     CACHE_NOISY(ALOGI("clear_cache_files: %d dirs, %d files\n", cache->numDirs, cache->numFiles));
     CACHE_NOISY(
@@ -1004,7 +1004,6 @@
 /* Ensure that /data/media directories are prepared for given user. */
 int ensure_media_user_dirs(userid_t userid) {
     char media_user_path[PATH_MAX];
-    char path[PATH_MAX];
 
     // Ensure /data/media/<userid> exists
     create_user_media_path(media_user_path, userid);
@@ -1017,7 +1016,6 @@
 
 int ensure_config_user_dirs(userid_t userid) {
     char config_user_path[PATH_MAX];
-    char path[PATH_MAX];
 
     // writable by system, readable by any app within the same user
     const int uid = (userid * AID_USER) + AID_SYSTEM;