diff options
| author | Werner Koch <wk@gnupg.org> | 2015-01-22 12:06:11 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-01-22 12:06:11 +0100 |
| commit | 11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993 (patch) | |
| tree | 0dd1a333374407a96a3258b4cb46a5e634e683ae /g10/verify.c | |
| parent | gpg: Remove an unused variable. (diff) | |
| download | gnupg2-11142e0ad7bc9a9e3c3dccf958d8dbd3312cb993.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to '')
| -rw-r--r-- | g10/verify.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/verify.c b/g10/verify.c index 2d5aab418..2efc89d05 100644 --- a/g10/verify.c +++ b/g10/verify.c @@ -113,7 +113,8 @@ verify_signatures (ctrl_t ctrl, int nfiles, char **files ) rc = proc_signature_packets (ctrl, NULL, fp, sl, sigfile ); free_strlist(sl); iobuf_close(fp); - if( (afx && afx->no_openpgp_data && rc == -1) || rc == G10ERR_NO_DATA ) { + if( (afx && afx->no_openpgp_data && rc == -1) + || gpg_err_code (rc) == GPG_ERR_NO_DATA ) { log_error(_("the signature could not be verified.\n" "Please remember that the signature file (.sig or .asc)\n" "should be the first file given on the command line.\n") ); @@ -202,7 +203,7 @@ verify_files (ctrl_t ctrl, int nfiles, char **files ) lno++; if( !*line || line[strlen(line)-1] != '\n' ) { log_error(_("input line %u too long or missing LF\n"), lno ); - return G10ERR_GENERAL; + return GPG_ERR_GENERAL; } /* This code does not work on MSDOS but how cares there are * also no script languages available. We don't strip any |