aboutsummaryrefslogtreecommitdiffstats
path: root/g10/dearmor.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2006-08-01 12:23:34 +0000
committerWerner Koch <[email protected]>2006-08-01 12:23:34 +0000
commit8c219602515ae1dba5bc0da31077852dab61809e (patch)
tree49d596d702cfec2b8cc42ccaf8c90c82d5200ac5 /g10/dearmor.c
parentForgot this one. (diff)
parent2006-07-29 Marcus Brinkmann <[email protected]> (diff)
downloadgnupg-8c219602515ae1dba5bc0da31077852dab61809e.tar.gz
gnupg-8c219602515ae1dba5bc0da31077852dab61809e.zip
Moved 1.9 branch to trunk
Diffstat (limited to 'g10/dearmor.c')
-rw-r--r--g10/dearmor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 8d7c60a5f..7f69a1bba 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -26,9 +26,9 @@
#include <errno.h>
#include <assert.h>
+#include "gpg.h"
#include "errors.h"
#include "iobuf.h"
-#include "memory.h"
#include "util.h"
#include "filter.h"
#include "packet.h"
@@ -58,9 +58,9 @@ dearmor_file( const char *fname )
errno = EPERM;
}
if (!inp) {
+ rc = gpg_error_from_errno (errno);
log_error(_("can't open `%s': %s\n"), fname? fname: "[stdin]",
strerror(errno) );
- rc = G10ERR_OPEN_FILE;
goto leave;
}
@@ -107,9 +107,9 @@ enarmor_file( const char *fname )
errno = EPERM;
}
if (!inp) {
+ rc = gpg_error_from_errno (errno);
log_error(_("can't open `%s': %s\n"), fname? fname: "[stdin]",
strerror(errno) );
- rc = G10ERR_OPEN_FILE;
goto leave;
}