From 3032fc3ad78ac9ed857570844547afed520d635a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 7 Mar 2014 09:46:44 +0100 Subject: 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. --- g10/decrypt.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'g10/decrypt.c') diff --git a/g10/decrypt.c b/g10/decrypt.c index f668ab83e..b0240f571 100644 --- a/g10/decrypt.c +++ b/g10/decrypt.c @@ -102,6 +102,13 @@ decrypt_message (ctrl_t ctrl, const char *filename) gpg_error_t decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd) { +#ifdef HAVE_W32_SYSTEM + /* No server mode yet. */ + (void)ctrl; + (void)input_fd; + (void)output_fd; + return gpg_error (GPG_ERR_NOT_IMPLEMENTED); +#else gpg_error_t err; IOBUF fp; armor_filter_context_t *afx = NULL; @@ -166,6 +173,7 @@ decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd) release_armor_context (afx); release_progress_context (pfx); return err; +#endif } -- cgit v1.2.3