summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-16 17:53:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-07-16 17:53:40 -0700
commit795e8f42c96a654a96ecb9eab3e9036b08676249 (patch)
treecd32cfe3780d42f77a06ad1d5725dee53f911e02 /cmds
parentda1bafd604a6df0d4d5d6d613ddd106d774ede38 (diff)
parent274bd902102291350f55ffb3eff08339929b2384 (diff)
downloadframeworks_native-795e8f42c96a654a96ecb9eab3e9036b08676249.zip
frameworks_native-795e8f42c96a654a96ecb9eab3e9036b08676249.tar.gz
frameworks_native-795e8f42c96a654a96ecb9eab3e9036b08676249.tar.bz2
am 0d039ba3: Merge change 7508 into donut
Merge commit '0d039ba328a59fc81280fbecf68aad2d2cba7234' * commit '0d039ba328a59fc81280fbecf68aad2d2cba7234': keystore: Fix a compile warning.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/keystore/keystore_get.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/keystore/keystore_get.h b/cmds/keystore/keystore_get.h
index a7fd9a5..7665e81 100644
--- a/cmds/keystore/keystore_get.h
+++ b/cmds/keystore/keystore_get.h
@@ -29,7 +29,7 @@
* is returned. Otherwise it returns the value in dynamically allocated memory
* and sets the size if the pointer is not NULL. One can release the memory by
* calling free(). */
-static char *keystore_get(char *key, int *size)
+static char *keystore_get(const char *key, int *size)
{
char buffer[MAX_KEY_VALUE_LENGTH];
char *value;