diff options
author | Kenny Root <kroot@google.com> | 2015-04-18 19:08:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-18 19:08:46 +0000 |
commit | 30ab66efa31e33ad8952be4d3b248fbc3054198c (patch) | |
tree | d8f961df0f1e45039dbfb1f8853c1341003e8549 | |
parent | 0af1e38cbd2584abaa3daa5d4b4e33f7f39cfb3b (diff) | |
parent | a680a0ca52d252c3a420c4e31752afe12ebbe81c (diff) | |
download | android_system_security-30ab66efa31e33ad8952be4d3b248fbc3054198c.tar.gz android_system_security-30ab66efa31e33ad8952be4d3b248fbc3054198c.tar.bz2 android_system_security-30ab66efa31e33ad8952be4d3b248fbc3054198c.zip |
am a680a0ca: am 57a72ec8: am 3ad91aa7: Merge "keystore-engine: comment out unused args"
* commit 'a680a0ca52d252c3a420c4e31752afe12ebbe81c':
keystore-engine: comment out unused args
-rw-r--r-- | keystore-engine/android_engine.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/keystore-engine/android_engine.cpp b/keystore-engine/android_engine.cpp index b368a3f..aa7bcbc 100644 --- a/keystore-engine/android_engine.cpp +++ b/keystore-engine/android_engine.cpp @@ -48,12 +48,12 @@ extern const RSA_METHOD keystore_rsa_method; extern const ECDSA_METHOD keystore_ecdsa_method; /* key_id_dup is called when one of the RSA or EC_KEY objects is duplicated. */ -int key_id_dup(CRYPTO_EX_DATA* to, - const CRYPTO_EX_DATA* from, +int key_id_dup(CRYPTO_EX_DATA* /* to */, + const CRYPTO_EX_DATA* /* from */, void** from_d, - int index, - long argl, - void* argp) { + int /* index */, + long /* argl */, + void* /* argp */) { char *key_id = reinterpret_cast<char *>(*from_d); if (key_id != NULL) { *from_d = strdup(key_id); @@ -62,12 +62,12 @@ int key_id_dup(CRYPTO_EX_DATA* to, } /* key_id_free is called when one of the RSA, DSA or EC_KEY object is freed. */ -void key_id_free(void* parent, +void key_id_free(void* /* parent */, void* ptr, - CRYPTO_EX_DATA* ad, - int index, - long argl, - void* argp) { + CRYPTO_EX_DATA* /* ad */, + int /* index */, + long /* argl */, + void* /* argp */) { char *key_id = reinterpret_cast<char *>(ptr); free(key_id); } |