commit 9443616391a705856b2cad026afb69dc23a346e9
author Chad Brubaker <cbrubaker@google.com> Tue May 12 15:18:26 2015 -0700
committer Chad Brubaker <cbrubaker@google.com> Tue May 12 19:18:19 2015 -0700
tree 8f1c57dfff83b4bed850d291c017086500ed53ec
parent 1932efc82007d4bbee5afbc29009d6ae6f780980

Cleanup keystore API

Remove old methods that were replaced by onUser* methods, rename methods
with unclear names, and add userId parameters to all operations that
operate with per user state.

Change-Id: I846fbb0a5ad17b4ee4c0c759fd1fd23f58b88d78

keystore/keystore_cli.cpp

diff --git a/keystore/keystore_cli.cpp b/keystore/keystore_cli.cpp
index 1391abf..a3088e4 100644
--- a/keystore/keystore_cli.cpp
+++ b/keystore/keystore_cli.cpp
@@ -76,6 +76,24 @@
         } \
     } while (0)
 
+#define SINGLE_INT_ARG_INT_RETURN(cmd) \
+    do { \
+        if (strcmp(argv[1], #cmd) == 0) { \
+            if (argc < 3) { \
+                fprintf(stderr, "Usage: %s " #cmd " <name>\n", argv[0]); \
+                return 1; \
+            } \
+            int32_t ret = service->cmd(atoi(argv[2])); \
+            if (ret < 0) { \
+                fprintf(stderr, "%s: could not connect: %d\n", argv[0], ret); \
+                return 1; \
+            } else { \
+                printf(#cmd ": %s (%d)\n", responses[ret], ret); \
+                return 0; \
+            } \
+        } \
+    } while (0)
+
 #define SINGLE_ARG_PLUS_UID_INT_RETURN(cmd) \
     do { \
         if (strcmp(argv[1], #cmd) == 0) { \
@@ -145,14 +163,14 @@
         } \
     } while (0)
 
-static int saw(sp<IKeystoreService> service, const String16& name, int uid) {
+static int list(sp<IKeystoreService> service, const String16& name, int uid) {
     Vector<String16> matches;
-    int32_t ret = service->saw(name, uid, &matches);
+    int32_t ret = service->list(name, uid, &matches);
     if (ret < 0) {
-        fprintf(stderr, "saw: could not connect: %d\n", ret);
+        fprintf(stderr, "list: could not connect: %d\n", ret);
         return 1;
     } else if (ret != ::NO_ERROR) {
-        fprintf(stderr, "saw: %s (%d)\n", responses[ret], ret);
+        fprintf(stderr, "list: %s (%d)\n", responses[ret], ret);
         return 1;
     } else {
         Vector<String16>::const_iterator it = matches.begin();
@@ -183,7 +201,7 @@
      * All the commands should return a value
      */
 
-    NO_ARG_INT_RETURN(test);
+    SINGLE_INT_ARG_INT_RETURN(getState);
 
     SINGLE_ARG_DATA_RETURN(get);
 
@@ -193,8 +211,8 @@
 
     SINGLE_ARG_PLUS_UID_INT_RETURN(exist);
 
-    if (strcmp(argv[1], "saw") == 0) {
-        return saw(service, argc < 3 ? String16("") : String16(argv[2]),
+    if (strcmp(argv[1], "list") == 0) {
+        return list(service, argc < 3 ? String16("") : String16(argv[2]),
                 argc < 4 ? -1 : atoi(argv[3]));
     }
 
@@ -202,18 +220,16 @@
 
     // TODO: notifyUserPasswordChanged
 
-    NO_ARG_INT_RETURN(lock);
+    SINGLE_INT_ARG_INT_RETURN(lock);
 
     // TODO: unlock
 
-    NO_ARG_INT_RETURN(zero);
+    SINGLE_INT_ARG_INT_RETURN(isEmpty);
 
     // TODO: generate
 
     SINGLE_ARG_DATA_RETURN(get_pubkey);
 
-    SINGLE_ARG_PLUS_UID_INT_RETURN(del_key);
-
     // TODO: grant
 
     // TODO: ungrant