summaryrefslogtreecommitdiffstats
path: root/g10/dearmor.c
diff options
context:
space:
mode:
authorDavid Shaw <dshaw@jabberwocky.com>2002-06-29 15:46:34 +0200
committerDavid Shaw <dshaw@jabberwocky.com>2002-06-29 15:46:34 +0200
commit3f51f7db3de85574dc5d6efd8b54ef78c1cd3f37 (patch)
treedac7a3780fb4edf9ca89c93800230e88ab255434 /g10/dearmor.c
parentUpdate head to match stable 1.0 (diff)
downloadgnupg2-3f51f7db3de85574dc5d6efd8b54ef78c1cd3f37.tar.xz
gnupg2-3f51f7db3de85574dc5d6efd8b54ef78c1cd3f37.zip
Update head to match stable 1.0
Diffstat (limited to 'g10/dearmor.c')
-rw-r--r--g10/dearmor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 937961e7f..4ec8fa012 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -1,5 +1,5 @@
/* dearmor.c - Armor utility
- * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -25,9 +25,9 @@
#include <errno.h>
#include <assert.h>
-#include <gcrypt.h>
#include "errors.h"
#include "iobuf.h"
+#include "memory.h"
#include "util.h"
#include "filter.h"
#include "packet.h"
@@ -52,7 +52,7 @@ dearmor_file( const char *fname )
if( !(inp = iobuf_open(fname)) ) {
log_error("can't open %s: %s\n", fname? fname: "[stdin]",
strerror(errno) );
- rc = GPGERR_OPEN_FILE;
+ rc = G10ERR_OPEN_FILE;
goto leave;
}
@@ -94,7 +94,7 @@ enarmor_file( const char *fname )
if( !(inp = iobuf_open(fname)) ) {
log_error("can't open %s: %s\n", fname? fname: "[stdin]",
strerror(errno) );
- rc = GPGERR_OPEN_FILE;
+ rc = G10ERR_OPEN_FILE;
goto leave;
}