From d088ff5626d63d50d1a41b77d27aadd85458e1d0 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 21 Dec 2001 01:41:12 +0000 Subject: [PATCH] 2001-12-21 Marcus Brinkmann * engine-gpgsm.c (_gpgme_gpgsm_new): Replace General_Error with Pipe_Error where appropriate. --- TODO | 5 +++++ gpgme/ChangeLog | 5 +++++ gpgme/engine-gpgsm.c | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 2dada0a6..9ce30145 100644 --- a/TODO +++ b/TODO @@ -18,6 +18,11 @@ * Move code common to all engines up from gpg to engine. +* Error Values +** Map ASSUAN error values. +** Map GpgSM ERR messages. +** Verify (and document) if Read_Error, Write_Error, Pipe_Error set errno. + * Tests ** t-data *** Test gpgme_data_release_and_get_mem. diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index ade6e9dd..0f3928cd 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2001-12-21 Marcus Brinkmann + + * engine-gpgsm.c (_gpgme_gpgsm_new): Replace General_Error with + Pipe_Error where appropriate. + 2001-12-19 Marcus Brinkmann * engine.c: Include `string.h'. Reported by Stéphane Corthésy. diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 1eb1d81c..ea54dd2d 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -158,7 +158,7 @@ _gpgme_gpgsm_new (GpgsmObject *r_gpgsm) if (_gpgme_io_pipe (fds, 0) < 0) { - err = mk_error (General_Error); + err = mk_error (Pipe_Error); goto leave; } gpgsm->input_fd = fds[1]; @@ -166,7 +166,7 @@ _gpgme_gpgsm_new (GpgsmObject *r_gpgsm) if (_gpgme_io_pipe (fds, 1) < 0) { - err = mk_error (General_Error); + err = mk_error (Pipe_Error); goto leave; } gpgsm->output_fd = fds[0]; @@ -174,7 +174,7 @@ _gpgme_gpgsm_new (GpgsmObject *r_gpgsm) if (_gpgme_io_pipe (fds, 0) < 0) { - err = mk_error (General_Error); + err = mk_error (Pipe_Error); goto leave; } gpgsm->message_fd = fds[1]; @@ -676,7 +676,7 @@ _gpgme_gpgsm_start (GpgsmObject gpgsm, void *opaque) nfds = assuan_get_active_fds (gpgsm->assuan_ctx, 0 /* read fds */, fdlist, DIM (fdlist)); if (nfds < 1) - return mk_error (General_Error); + return mk_error (General_Error); /* FIXME */ err = _gpgme_register_pipe_handler (opaque, gpgsm_status_handler, gpgsm, pid, fdlist[0], 1);