summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-03 09:08:36 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-07-03 09:08:36 -0700
commit84fcd18ecbd92df932af34568634d41d43784ea2 (patch)
tree81be64cc4cc6520223f384ea76d13ed16d877ebd /cmds
parent133ec72f2480a65a02c8e1e5d9540796a0d05895 (diff)
parent7de4bd9b40d80fd68fc746efd645e3df7442acea (diff)
downloadframeworks_base-84fcd18ecbd92df932af34568634d41d43784ea2.zip
frameworks_base-84fcd18ecbd92df932af34568634d41d43784ea2.tar.gz
frameworks_base-84fcd18ecbd92df932af34568634d41d43784ea2.tar.bz2
am 7de4bd9b: Merge change 6045 into donut
Merge commit '7de4bd9b40d80fd68fc746efd645e3df7442acea' * commit '7de4bd9b40d80fd68fc746efd645e3df7442acea': Remove the null-termination for Java string compatibility.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/keystore/netkeystore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/keystore/netkeystore.c b/cmds/keystore/netkeystore.c
index b0d683c..e45e24f 100644
--- a/cmds/keystore/netkeystore.c
+++ b/cmds/keystore/netkeystore.c
@@ -142,7 +142,7 @@ static void do_get_state(LPC_MARSHAL *cmd, LPC_MARSHAL *reply)
static void do_listkeys(LPC_MARSHAL *cmd, LPC_MARSHAL *reply)
{
reply->retcode = list_keys((const char*)cmd->data, (char*)reply->data);
- if (!reply->retcode) reply->len = strlen((char*)reply->data) + 1;
+ if (!reply->retcode) reply->len = strlen((char*)reply->data);
}
// args of get():