Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 26188 into eclair

Browse Source 
* changes:
  keystore: rename scan() to saw().
This commit is contained in:
Android (Google) Code Review
2009-09-21 14:58:43 -04:00
parent 83f7bd0a9b 1f6802295e
commit e045e129a9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmds/keystore/keystore.c
View File

@@ -291,7 +291,7 @@ static int8_t exist()
return NO_ERROR; return NO_ERROR;
} }
static int8_t scan() static int8_t saw()
{ {
DIR *dir = opendir("."); DIR *dir = opendir(".");
struct dirent *file; struct dirent *file;
@@ -411,7 +411,7 @@ enum perm {
INSERT = 4, INSERT = 4,
DELETE = 8, DELETE = 8,
EXIST = 16, EXIST = 16,
SCAN = 32, SAW = 32,
RESET = 64, RESET = 64,
PASSWORD = 128, PASSWORD = 128,
LOCK = 256, LOCK = 256,
@@ -430,7 +430,7 @@ static struct action {
{insert, 'i', NO_ERROR, INSERT, {KEY_SIZE, VALUE_SIZE}}, {insert, 'i', NO_ERROR, INSERT, {KEY_SIZE, VALUE_SIZE}},
{delete, 'd', 0, DELETE, {KEY_SIZE}}, {delete, 'd', 0, DELETE, {KEY_SIZE}},
{exist, 'e', 0, EXIST, {KEY_SIZE}}, {exist, 'e', 0, EXIST, {KEY_SIZE}},
{scan, 's', 0, SCAN, {KEY_SIZE}}, {saw, 's', 0, SAW, {KEY_SIZE}},
{reset, 'r', 0, RESET, {0}}, {reset, 'r', 0, RESET, {0}},
{password, 'p', 0, PASSWORD, {PASSWORD_SIZE, PASSWORD_SIZE}}, {password, 'p', 0, PASSWORD, {PASSWORD_SIZE, PASSWORD_SIZE}},
{lock, 'l', NO_ERROR, LOCK, {0}}, {lock, 'l', NO_ERROR, LOCK, {0}},
@@ -446,7 +446,7 @@ static struct user {
{AID_SYSTEM, 0, ~GET}, {AID_SYSTEM, 0, ~GET},
{AID_VPN, AID_SYSTEM, GET}, {AID_VPN, AID_SYSTEM, GET},
{AID_WIFI, AID_SYSTEM, GET}, {AID_WIFI, AID_SYSTEM, GET},
{0, 0, TEST | GET | INSERT | DELETE | EXIST | SCAN}, {0, 0, TEST | GET | INSERT | DELETE | EXIST | SAW},
}; };
static int8_t process(int8_t code) { static int8_t process(int8_t code) {