aboutsummaryrefslogtreecommitdiffstats
path: root/gpgme/encrypt.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2003-06-06 00:56:03 +0000
committerMarcus Brinkmann <[email protected]>2003-06-06 00:56:03 +0000
commita8fe22ca6ba1ef72e603611b6b72b65a701e1575 (patch)
treeed8b196feee76d988200439cc83e5372d553dec4 /gpgme/encrypt.c
parentFix last change. (diff)
downloadgpgme-a8fe22ca6ba1ef72e603611b6b72b65a701e1575.tar.gz
gpgme-a8fe22ca6ba1ef72e603611b6b72b65a701e1575.zip
doc/
2003-06-06 Marcus Brinkmann <[email protected]> * gpgme.texi (Crypto Operations): Rename gpgme_invalid_user_id_t to gpgme_invalid_key_t. gpgme/ 2003-06-06 Marcus Brinkmann <[email protected]> * op-support.c (_gpgme_parse_inv_userid): Rename to _gpgme_parse_inv_recp and change to new datatype. * ops.h (_gpgme_parse_inv_key): Fix prototype. * gpgme.h (struct _gpgme_invalid_user_id): Rename to __gpgme_invalid_key. Rename field ID to KEY. (gpgme_invalid_user_id_t): Rename to gpgme_invalid_key_t. (struct _gpgme_op_encrypt_result): Here, too. (struct _gpgme_op_sign_result): Likewise. * encrypt.c (struct op_data): Likewise. (release_op_data): Likewise. * sign.c (struct op_data): Likewise. (release_op_data): Likewise.
Diffstat (limited to '')
-rw-r--r--gpgme/encrypt.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c
index 50c13d98..61619ed9 100644
--- a/gpgme/encrypt.c
+++ b/gpgme/encrypt.c
@@ -37,7 +37,7 @@ typedef struct
/* A pointer to the next pointer of the last invalid recipient in
the list. This makes appending new invalid recipients painless
while preserving the order. */
- gpgme_invalid_user_id_t *lastp;
+ gpgme_invalid_key_t *lastp;
} *op_data_t;
@@ -45,12 +45,13 @@ static void
release_op_data (void *hook)
{
op_data_t opd = (op_data_t) hook;
- gpgme_invalid_user_id_t invalid_recipient = opd->result.invalid_recipients;
+ gpgme_invalid_key_t invalid_recipient = opd->result.invalid_recipients;
while (invalid_recipient)
{
- gpgme_invalid_user_id_t next = invalid_recipient->next;
- free (invalid_recipient->id);
+ gpgme_invalid_key_t next = invalid_recipient->next;
+ if (invalid_recipient->fpr)
+ free (invalid_recipient->fpr);
invalid_recipient = next;
}
}
@@ -95,7 +96,7 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code,
break;
case GPGME_STATUS_INV_RECP:
- err = _gpgme_parse_inv_userid (args, opd->lastp);
+ err = _gpgme_parse_inv_recp (args, opd->lastp);
if (err)
return err;