card: Suppress error message by agent_scd_cardlist.

[gnupg.git] / g10 / dearmor.c

diff --git a/g10/dearmor.c b/g10/dearmor.c
index 04b9e61..92239cc 100644 (file)
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -22,17 +22,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "gpg.h"
-#include "status.h"
-#include "iobuf.h"
-#include "util.h"
+#include "../common/status.h"
+#include "../common/iobuf.h"
+#include "../common/util.h"
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
 #include "main.h"
-#include "i18n.h"
+#include "../common/i18n.h"
 
 /****************
  * Take an armor file and write it out without armor
@@ -57,14 +56,14 @@ dearmor_file( const char *fname )
       }
     if (!inp) {
         rc = gpg_error_from_syserror ();
-       log_error(_("can't open `%s': %s\n"), fname? fname: "[stdin]",
+       log_error(_("can't open '%s': %s\n"), fname? fname: "[stdin]",
                                        strerror(errno) );
        goto leave;
     }
 
     push_armor_filter ( afx, inp );
 
-    if( (rc = open_outfile (GNUPG_INVALID_FD, fname, 0, &out )) )
+    if( (rc = open_outfile (-1, fname, 0, 0, &out)) )
        goto leave;
 
     while( (c = iobuf_get(inp)) != -1 )
@@ -104,13 +103,13 @@ enarmor_file( const char *fname )
       }
     if (!inp) {
         rc = gpg_error_from_syserror ();
-       log_error(_("can't open `%s': %s\n"), fname? fname: "[stdin]",
+       log_error(_("can't open '%s': %s\n"), fname? fname: "[stdin]",
                   strerror(errno) );
        goto leave;
     }
 
 
-    if( (rc = open_outfile (GNUPG_INVALID_FD, fname, 1, &out )) )
+    if( (rc = open_outfile (-1, fname, 1, 0, &out )) )
        goto leave;
 
     afx->what = 4;
@@ -130,5 +129,3 @@ enarmor_file( const char *fname )
     release_armor_context (afx);
     return rc;
 }
-
-