summaryrefslogtreecommitdiffstats
path: root/g10/dearmor.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2014-03-07 09:46:44 +0100
committerWerner Koch <wk@gnupg.org>2014-03-07 16:06:35 +0100
commit3032fc3ad78ac9ed857570844547afed520d635a (patch)
tree5aa245750d356cbdf6e7d51fb97b7c0fc8d4dc17 /g10/dearmor.c
parentw32: Include winsock2.h to silence warnings. (diff)
downloadgnupg2-3032fc3ad78ac9ed857570844547afed520d635a.tar.xz
gnupg2-3032fc3ad78ac9ed857570844547afed520d635a.zip
Silence several warnings when building under Windows.
* agent/call-scd.c (start_scd): Replace int by assuan_fd_t. (start_pinentry): Ditto. * common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t. * common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for prototypes on Windows and some other platforms. * common/logging.c (fun_writer): Declare addrbuf only if needed. * g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented. * g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server mode. * g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD by -1 as temporary hack for Windows. * g10/export.c (do_export): Ditto. * g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto. * g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto. * g10/server.c (cmd_verify, gpg_server) [W32]: Return an error. -- The gpg server mode is not actual working and thus we can avoid the warnings by explicitly disabling the mode. We keep it working under Unix, though.
Diffstat (limited to 'g10/dearmor.c')
-rw-r--r--g10/dearmor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 0f62f5465..d84fb30de 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -64,7 +64,7 @@ dearmor_file( const char *fname )
push_armor_filter ( afx, inp );
- if( (rc = open_outfile (GNUPG_INVALID_FD, fname, 0, &out )) )
+ if( (rc = open_outfile (-1, fname, 0, &out )) )
goto leave;
while( (c = iobuf_get(inp)) != -1 )
@@ -110,7 +110,7 @@ enarmor_file( const char *fname )
}
- if( (rc = open_outfile (GNUPG_INVALID_FD, fname, 1, &out )) )
+ if( (rc = open_outfile (-1, fname, 1, &out )) )
goto leave;
afx->what = 4;