commit 5eecc449cc75771cc0c6eb0ad936117d16704b83
author Mark Salyzyn <salyzyn@google.com> Wed Feb 12 14:16:14 2014 -0800
committer Mark Salyzyn <salyzyn@google.com> Wed Feb 12 14:27:51 2014 -0800
tree 3c4b870c075f8651c7780e36e796d1f6c6e9a843
parent 311edc8cb2dd5c86bad49f9696333874b400f9c4

vold: suppress unused argument warning messages

(cherry picked from commit 3e971277db0d87652af5622c989233e7159ab909)

Change-Id: Ic1ab533f756fbd44b1f2e5ae12e2f5736ace7740

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index a742a63..e545919 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -50,6 +50,8 @@
 #include "VoldUtil.h"
 #include "crypto_scrypt.h"
 
+#define UNUSED __attribute__((unused))
+
 #define DM_CRYPT_BUF_SIZE 4096
 #define DATA_MNT_POINT "/data"
 
@@ -868,7 +870,7 @@
 
 }
 
-static void pbkdf2(char *passwd, unsigned char *salt, unsigned char *ikey, void *params) {
+static void pbkdf2(char *passwd, unsigned char *salt, unsigned char *ikey, void *params UNUSED) {
     /* Turn the password into a key and IV that can decrypt the master key */
     PKCS5_PBKDF2_HMAC_SHA1(passwd, strlen(passwd), salt, SALT_LEN,
                            HASH_COUNT, KEY_LEN_BYTES+IV_LEN_BYTES, ikey);
@@ -1150,7 +1152,7 @@
     return rc;
 }
 
-static int do_crypto_complete(char *mount_point)
+static int do_crypto_complete(char *mount_point UNUSED)
 {
   struct crypt_mnt_ftr crypt_ftr;
   char encrypted_state[PROPERTY_VALUE_MAX];