GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2004-10-22 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* engine-gpgsm.c (map_assuan_error): Return 0 if ERR is 0.
	(start): Call map_assuan_error on return value of
	assuan_write_line.
This commit is contained in:
Marcus Brinkmann 2004-10-22 16:55:16 +00:00
parent 9bccf0d830
commit e2297804cf
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gpgme/ChangeLog
View File

@ -1,3 +1,9 @@
2004-10-22 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgsm.c (map_assuan_error): Return 0 if ERR is 0.
(start): Call map_assuan_error on return value of
assuan_write_line.
2004-10-05 Marcus Brinkmann <marcus@g10code.de> 2004-10-05 Marcus Brinkmann <marcus@g10code.de>
* op-support.c (_gpgme_op_data_lookup): Use char pointer for * op-support.c (_gpgme_op_data_lookup): Use char pointer for

6
gpgme/engine-gpgsm.c
View File

@ -153,6 +153,9 @@ close_notify_handler (int fd, void *opaque)
static gpgme_error_t static gpgme_error_t
map_assuan_error (AssuanError err) map_assuan_error (AssuanError err)
{ {
if (!err)
return 0;
if (err == -1) if (err == -1)
return gpg_error (GPG_ERR_INV_ENGINE); return gpg_error (GPG_ERR_INV_ENGINE);
@ -398,6 +401,7 @@ gpgsm_new (void **engine, const char *lc_ctype, const char *lc_messages)
err = assuan_pipe_connect (&gpgsm->assuan_ctx, err = assuan_pipe_connect (&gpgsm->assuan_ctx,
_gpgme_get_gpgsm_path (), argv, child_fds); _gpgme_get_gpgsm_path (), argv, child_fds);
/* FIXME: Check error. */
/* We need to know the fd used by assuan for reads. We do this by /* We need to know the fd used by assuan for reads. We do this by
using the assumption that the first returned fd from using the assumption that the first returned fd from
@ -866,7 +870,7 @@ start (engine_gpgsm_t gpgsm, const char *command)
err = add_io_cb (gpgsm, &gpgsm->message_cb, _gpgme_data_outbound_handler); err = add_io_cb (gpgsm, &gpgsm->message_cb, _gpgme_data_outbound_handler);
if (!err) if (!err)
err = assuan_write_line (gpgsm->assuan_ctx, command); err = map_assuan_error (assuan_write_line (gpgsm->assuan_ctx, command));
if (!err) if (!err)
(*gpgsm->io_cbs.event) (gpgsm->io_cbs.event_priv, GPGME_EVENT_START, NULL); (*gpgsm->io_cbs.event) (gpgsm->io_cbs.event_priv, GPGME_EVENT_START, NULL);