commit af5a8090bffb245cc6b5a19669ffb1f10dfe7bc8
author Android (Google) Code Review <android-gerrit@google.com> Thu Sep 17 02:05:21 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 17 02:05:21 2009 -0400
tree cc82782161e8a8a4ca87d69c0af6077424ee6077
parent de09c5fa4d12f8f7c6c2ecfa538b5baad2c05727
parent 408c5f2c9846780f05c2a3b3c837fecd5f5c74a6

Merge change 25440 into eclair

* changes:
  Fix a minor bug in is_alnum_string()...

cmds/keystore/netkeystore.c

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 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 @@
 // 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 @@
 
         // 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);
     }