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
commit4c6ee740ad3046bb67f3f24a728e48dff86b85b8 (patch)
treeb8b21b45ed35b187e38eb14f8189ce6de9bb66ff /cmds
parentd9245ddab90be271537f2dc1129beb33766d8e68 (diff)
parent0919ff5f14ee21d3cb9d28da3537d0032225fded (diff)
downloadframeworks_native-4c6ee740ad3046bb67f3f24a728e48dff86b85b8.zip
frameworks_native-4c6ee740ad3046bb67f3f24a728e48dff86b85b8.tar.gz
frameworks_native-4c6ee740ad3046bb67f3f24a728e48dff86b85b8.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():