diff options
| author | Werner Koch <wk@gnupg.org> | 2000-01-27 17:50:45 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2000-01-27 17:50:45 +0100 |
| commit | baa30ad117e12c5182a78ede84c5103bea23616b (patch) | |
| tree | f1d174362ee1855c5af77dcb917451e026c0a8d5 /g10/delkey.c | |
| parent | See ChangeLog: Mon Jan 24 22:24:38 CET 2000 Werner Koch (diff) | |
| download | gnupg2-baa30ad117e12c5182a78ede84c5103bea23616b.tar.xz gnupg2-baa30ad117e12c5182a78ede84c5103bea23616b.zip | |
See ChangeLog: Thu Jan 27 18:00:44 CET 2000 Werner Koch
Diffstat (limited to 'g10/delkey.c')
| -rw-r--r-- | g10/delkey.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/delkey.c b/g10/delkey.c index 9de3a7b08..c452567a8 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -68,7 +68,7 @@ delete_key( const char *username, int secret ) /* read the keyblock */ rc = read_keyblock( &kbpos, &keyblock ); if( rc ) { - log_error("%s: read problem: %s\n", username, g10_errstr(rc) ); + log_error("%s: read problem: %s\n", username, gpg_errstr(rc) ); goto leave; } @@ -76,7 +76,7 @@ delete_key( const char *username, int secret ) node = find_kbnode( keyblock, secret? PKT_SECRET_KEY:PKT_PUBLIC_KEY ); if( !node ) { log_error("Oops; key not found anymore!\n"); - rc = G10ERR_GENERAL; + rc = GPGERR_GENERAL; goto leave; } @@ -95,8 +95,8 @@ delete_key( const char *username, int secret ) "use option \"--delete-secret-key\" to delete it first.\n")); rc = -1; } - else if( rc != G10ERR_NO_SECKEY ) - log_error("%s: get secret key: %s\n", username, g10_errstr(rc) ); + else if( rc != GPGERR_NO_SECKEY ) + log_error("%s: get secret key: %s\n", username, gpg_errstr(rc) ); else rc = 0; } @@ -148,7 +148,7 @@ delete_key( const char *username, int secret ) if( okay ) { rc = delete_keyblock( &kbpos ); if( rc ) { - log_error("delete_keyblock failed: %s\n", g10_errstr(rc) ); + log_error("delete_keyblock failed: %s\n", gpg_errstr(rc) ); goto leave; } } |