diff options
author | Werner Koch <[email protected]> | 2011-02-04 11:57:53 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2011-02-04 11:57:53 +0000 |
commit | b008274afdbe375b32a7e66dbd073e200f6f0587 (patch) | |
tree | 219e239d39cf06be3f03aa82fb572080ac163a15 /sm/delete.c | |
parent | Let autogen.sh check the git config (diff) | |
download | gnupg-b008274afdbe375b32a7e66dbd073e200f6f0587.tar.gz gnupg-b008274afdbe375b32a7e66dbd073e200f6f0587.zip |
Nuked almost all trailing white space.post-nuke-of-trailing-ws
We better do this once and for all instead of cluttering all future
commits with diffs of trailing white spaces. In the majority of cases
blank or single lines are affected and thus this change won't disturb
a git blame too much. For future commits the pre-commit scripts
checks that this won't happen again.
Diffstat (limited to '')
-rw-r--r-- | sm/delete.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sm/delete.c b/sm/delete.c index e2835a98b..10ec965cb 100644 --- a/sm/delete.c +++ b/sm/delete.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#include <unistd.h> +#include <unistd.h> #include <time.h> #include <assert.h> @@ -44,7 +44,7 @@ delete_one (ctrl_t ctrl, const char *username) ksba_cert_t cert = NULL; int duplicates = 0; int is_ephem = 0; - + rc = classify_user_id (username, &desc); if (rc) { @@ -122,8 +122,8 @@ delete_one (ctrl_t ctrl, const char *username) log_error (_("error locking keybox: %s\n"), gpg_strerror (rc)); goto leave; } - - do + + do { keydb_search_reset (kh); rc = keydb_search (kh, &desc, 1); @@ -133,9 +133,9 @@ delete_one (ctrl_t ctrl, const char *username) gpg_strerror (rc)); goto leave; } - + rc = keydb_delete (kh, duplicates ? 0 : 1); - if (rc) + if (rc) goto leave; if (opt.verbose) { @@ -166,7 +166,7 @@ gpgsm_delete (ctrl_t ctrl, strlist_t names) log_error ("nothing to delete\n"); return gpg_error (GPG_ERR_NO_DATA); } - + for (; names; names=names->next ) { rc = delete_one (ctrl, names->d); @@ -177,6 +177,6 @@ gpgsm_delete (ctrl_t ctrl, strlist_t names) return rc; } } - + return 0; } |