diff options
author | Hung-ying Tyan <tyanh@google.com> | 2009-09-16 15:43:15 +0800 |
---|---|---|
committer | Hung-ying Tyan <tyanh@google.com> | 2009-09-17 12:17:29 +0800 |
commit | 5b680802b6774491fbcee69e394d097d4bfcf42e (patch) | |
tree | 7ad1163a5de706df8c48dbc9c1e9c7fd0421fc2a /cmds/keystore | |
parent | 972f0e3806f379b7fb6e43265f56ddd91c38107e (diff) | |
download | frameworks_base-5b680802b6774491fbcee69e394d097d4bfcf42e.zip frameworks_base-5b680802b6774491fbcee69e394d097d4bfcf42e.tar.gz frameworks_base-5b680802b6774491fbcee69e394d097d4bfcf42e.tar.bz2 |
Fix a minor bug in is_alnum_string()...
and remove some verbose logging
Diffstat (limited to 'cmds/keystore')
-rw-r--r-- | cmds/keystore/netkeystore.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cmds/keystore/netkeystore.c b/cmds/keystore/netkeystore.c index 83c7871..87fdc80 100644 --- a/cmds/keystore/netkeystore.c +++ b/cmds/keystore/netkeystore.c @@ -116,10 +116,13 @@ static int parse_strings(char *data, int data_len, int ntokens, ...) static int is_alnum_string(char *s) { + char *s0 = s; while (*s != 0) { - if (!isalnum(*s++)) return 0; + if (!isalnum(*s++)) { + LOGE("The string '%s' is not an alphanumeric string\n", s0); + return 0; + } } - LOGE("The string %s is not an alphanumeric string\n", s); return 1; } @@ -159,7 +162,9 @@ static void do_unlock(LPC_MARSHAL *cmd, LPC_MARSHAL *reply) // no argument static void do_get_state(LPC_MARSHAL *cmd, LPC_MARSHAL *reply) { - reply->retcode = get_state(); + int s = get_state(); + if (DBG) LOGD("keystore state = %d\n", s); + reply->retcode = s; } // args of listkeys(): @@ -413,12 +418,10 @@ int server_main(const int argc, const char *argv[]) // read the command, execute and send the result back. if(read_marshal(s, &cmd)) goto err; - if (DBG) LOGD("new connection\n"); execute(&cmd, &reply); write_marshal(s, &reply); err: memset(&reply, 0, sizeof(LPC_MARSHAL)); - if (DBG) LOGD("closing connection\n"); close(s); } |