From e0fbe815142850484fcff4bad876158676371d23 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 5 Dec 2001 13:23:59 +0000 Subject: [PATCH] 2001-12-05 Marcus Brinkmann * keylist.c (gpgme_op_keylist_next): Set pending to 0 if EOF occurs. --- trunk/gpgme/ChangeLog | 5 +++ trunk/gpgme/keylist.c | 78 +++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index dd78d7b..6d4b9a9 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2001-12-05 Marcus Brinkmann + + * keylist.c (gpgme_op_keylist_next): Set pending to 0 if EOF + occurs. + 2001-11-26 Marcus Brinkmann * engine-gpgsm.c (_gpgme_gpgsm_op_sign): Fix stupid typo. diff --git a/trunk/gpgme/keylist.c b/trunk/gpgme/keylist.c index 2685f4f..323d636 100644 --- a/trunk/gpgme/keylist.c +++ b/trunk/gpgme/keylist.c @@ -367,9 +367,6 @@ finish_key ( GpgmeCtx ctx ) } } - - - /** * gpgme_op_keylist_start: * @c: context @@ -430,52 +427,53 @@ gpgme_op_keylist_start (GpgmeCtx ctx, const char *pattern, int secret_only) return err; } - /** * gpgme_op_keylist_next: * @c: Context * @r_key: Returned key object * * Return the next key from the key listing started with - * gpgme_op_keylist_start(). The caller must free the key using - * gpgme_key_release(). + * gpgme_op_keylist_start(). The caller must free the key using + * gpgme_key_release(). If the last key has already been returned the + * last time the function was called, %GPGME_EOF is returned and the + * operation is finished. * - * Return value: 0 on success, %GPGME_EOF or anoter error code. + * Return value: 0 on success, %GPGME_EOF or another error code. **/ GpgmeError -gpgme_op_keylist_next ( GpgmeCtx c, GpgmeKey *r_key ) +gpgme_op_keylist_next (GpgmeCtx ctx, GpgmeKey *r_key) { - struct key_queue_item_s *q; - - if (!r_key) - return mk_error (Invalid_Value); - *r_key = NULL; - if (!c) - return mk_error (Invalid_Value); - if ( !c->pending ) - return mk_error (No_Request); - if ( c->out_of_core ) - return mk_error (Out_Of_Core); - - if ( !c->key_queue ) { - _gpgme_wait_on_condition (c, 1, &c->key_cond ); - if ( c->out_of_core ) - return mk_error (Out_Of_Core); - if ( !c->key_cond ) - return mk_error (EOF); - c->key_cond = 0; - assert ( c->key_queue ); - } - q = c->key_queue; - c->key_queue = q->next; - if (!c->key_queue) - c->key_cond = 0; - - *r_key = q->key; - xfree (q); - return 0; -} - - + struct key_queue_item_s *queue_item; + if (!r_key) + return mk_error (Invalid_Value); + *r_key = NULL; + if (!ctx) + return mk_error (Invalid_Value); + if (!ctx->pending ) + return mk_error (No_Request); + if (ctx->out_of_core) + return mk_error (Out_Of_Core); + if (!ctx->key_queue) + { + _gpgme_wait_on_condition (ctx, 1, &ctx->key_cond); + if (ctx->out_of_core) + return mk_error (Out_Of_Core); + if (!ctx->key_cond) + { + ctx->pending = 0; + return mk_error (EOF); + } + ctx->key_cond = 0; + assert (ctx->key_queue); + } + queue_item = ctx->key_queue; + ctx->key_queue = queue_item->next; + if (!ctx->key_queue) + ctx->key_cond = 0; + + *r_key = queue_item->key; + xfree (queue_item); + return 0; +} -- 2.26.2