commit 3e971277db0d87652af5622c989233e7159ab909
author Mark Salyzyn <salyzyn@google.com> Tue Jan 21 13:27:04 2014 -0800
committer Mark Salyzyn <salyzyn@google.com> Wed Feb 12 20:18:28 2014 +0000
tree 0a67ffbfaf0f3dd4e2ff5c03c8f25f09b1260367
parent 4ff7225154ad14a01065b04c49d3ee179ffb6c10

vold: suppress unused argument warning messages

Change-Id: Ic1ab533f756fbd44b1f2e5ae12e2f5736ace7740

cryptfs.c

diff --git a/cryptfs.c b/cryptfs.c
index 4dc9faa..40ad36a 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -51,6 +51,8 @@
 #include "crypto_scrypt.h"
 #include "ext4_utils.h"
 
+#define UNUSED __attribute__((unused))
+
 #define DM_CRYPT_BUF_SIZE 4096
 
 #define HASH_COUNT 2000
@@ -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);
@@ -1161,7 +1163,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];