diff options
| author | Werner Koch <[email protected]> | 2015-01-22 11:06:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-01-22 11:06:11 +0000 |
| commit | 11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993 (patch) | |
| tree | 0dd1a333374407a96a3258b4cb46a5e634e683ae /g10/armor.c | |
| parent | gpg: Remove an unused variable. (diff) | |
| download | gnupg-11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993.tar.gz gnupg-11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993.zip | |
gpg: Replace remaining old error code macros by GPG_ERR_.
* g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
gpg_strerror.
(G10ERR_): Remove all macros and change all occurrences by their
GPG_ERR_ counterparts.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/armor.c')
| -rw-r--r-- | g10/armor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/armor.c b/g10/armor.c index b00f9854f..e36866009 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -534,7 +534,7 @@ check_input( armor_filter_context_t *afx, IOBUF a ) i = parse_header_line( afx, line, len ); if( i <= 0 ) { if (i && RFC2440) - rc = G10ERR_INVALID_ARMOR; + rc = GPG_ERR_INV_ARMOR; break; } } @@ -915,11 +915,11 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, rc = 0; else if( rc == 2 ) { log_error(_("premature eof (in trailer)\n")); - rc = G10ERR_INVALID_ARMOR; + rc = GPG_ERR_INVALID_ARMOR; } else { log_error(_("error in trailer line\n")); - rc = G10ERR_INVALID_ARMOR; + rc = GPG_ERR_INVALID_ARMOR; } #endif } |