exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

actions: simplify key deletion code a bit

Browse source
This commit is contained in:
Mirek Kratochvil 2014-01-24 10:35:56 +01:00
parent f2d1ba9365
commit 1ccd8e8b3a
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/actions.cpp
View file

@ -1178,11 +1178,13 @@ int action_delete (bool yes, const std::string & filter, keyring & KR)
PREPARE_KEYRING; PREPARE_KEYRING;
int kc = 0; int kc = 0;
std::list<std::string> todel;
for (keyring::pubkey_storage::iterator for (keyring::pubkey_storage::iterator
i = KR.pubs.begin(), e = KR.pubs.end(); i = KR.pubs.begin(), e = KR.pubs.end();
i != e; ++i) { i != e; ++i)
if (keyspec_matches (filter, i->second.name, i->first) ) if (keyspec_matches (filter, i->second.name, i->first) ) {
++kc; ++kc;
todel.push_back (i->first);
} }
if (!kc) { if (!kc) {
err ("no such key"); err ("no such key");
@ -1196,14 +1198,6 @@ int action_delete (bool yes, const std::string & filter, keyring & KR)
} }
//all clear, delete them //all clear, delete them
std::list<std::string> todel;
for (keyring::pubkey_storage::iterator
i = KR.pubs.begin(), e = KR.pubs.end();
i != e; ++i) {
if (keyspec_matches (filter, i->second.name, i->first) )
todel.push_back (i->first);
}
for (std::list<std::string>::iterator for (std::list<std::string>::iterator
i = todel.begin(), e = todel.end(); i != e; ++i) i = todel.begin(), e = todel.end(); i != e; ++i)
KR.remove_pubkey (*i); KR.remove_pubkey (*i);
@ -1440,12 +1434,15 @@ int action_delete_sec (bool yes, const std::string & filter, keyring & KR)
PREPARE_KEYRING; PREPARE_KEYRING;
int kc = 0; int kc = 0;
std::list<std::string> todel;
for (keyring::keypair_storage::iterator for (keyring::keypair_storage::iterator
i = KR.pairs.begin(), e = KR.pairs.end(); i = KR.pairs.begin(), e = KR.pairs.end();
i != e; ++i) { i != e; ++i)
if (keyspec_matches (filter, i->second.pub.name, i->first) ) if (keyspec_matches (filter, i->second.pub.name, i->first) ) {
++kc; ++kc;
todel.push_back (i->first);
} }
if (!kc) { if (!kc) {
err ("error: no such key"); err ("error: no such key");
return 0; return 0;
@ -1458,14 +1455,6 @@ int action_delete_sec (bool yes, const std::string & filter, keyring & KR)
} }
//all clear, delete them //all clear, delete them
std::list<std::string> todel;
for (keyring::keypair_storage::iterator
i = KR.pairs.begin(), e = KR.pairs.end();
i != e; ++i) {
if (keyspec_matches (filter, i->second.pub.name, i->first) )
todel.push_back (i->first);
}
for (std::list<std::string>::iterator for (std::list<std::string>::iterator
i = todel.begin(), e = todel.end(); i != e; ++i) i = todel.begin(), e = todel.end(); i != e; ++i)
KR.remove_keypair (*i); KR.remove_keypair (*i);