aboutsummaryrefslogtreecommitdiffstats
path: root/gpgme/trustlist.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2003-01-29 16:10:35 +0000
committerMarcus Brinkmann <[email protected]>2003-01-29 16:10:35 +0000
commit6912c46a77d2aa1274aeef028d8e98bd917b64dc (patch)
tree8e537b11f0a4188d2da3861639695ea083ad6328 /gpgme/trustlist.c
parentAdd some items, remove obsolete item about pipemode. (diff)
downloadgpgme-6912c46a77d2aa1274aeef028d8e98bd917b64dc.tar.gz
gpgme-6912c46a77d2aa1274aeef028d8e98bd917b64dc.zip
2003-01-29 Marcus Brinkmann <[email protected]>
* util.h (mk_error): Remove macro. * conversion.c, data.c, data-compat.c, decrypt.c, delete.c, edit.c, encrypt.c, encrypt-sign.c, engine.c, engine-gpgsm.c, export.c, genkey.c, gpgme.c, import.c, key.c, keylist.c, passphrase.c, progress.c, recipient.c, rungpg.c, sign.c, signers.c, trustlist.c, verify.c, wait.c, wait-global.c, wait-private (literally everywhere): Expand the mk_error macro.
Diffstat (limited to '')
-rw-r--r--gpgme/trustlist.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/gpgme/trustlist.c b/gpgme/trustlist.c
index 11860322..81b255cc 100644
--- a/gpgme/trustlist.c
+++ b/gpgme/trustlist.c
@@ -100,7 +100,7 @@ trustlist_colon_handler (GpgmeCtx ctx, char *line)
case 1: /* level */
item = trust_item_new ();
if (!item)
- return mk_error (Out_Of_Core);
+ return GPGME_Out_Of_Core;
item->level = atoi (p);
break;
case 2: /* long keyid */
@@ -121,7 +121,7 @@ trustlist_colon_handler (GpgmeCtx ctx, char *line)
case 9: /* user ID */
item->name = strdup (p);
if (!item->name)
- return mk_error (Out_Of_Core);
+ return GPGME_Out_Of_Core;
break;
}
}
@@ -146,7 +146,7 @@ _gpgme_op_trustlist_event_cb (void *data, GpgmeEventIO type, void *type_data)
{
gpgme_trust_item_release (item);
/* FIXME */
- /* ctx->error = mk_error (Out_Of_Core); */
+ /* ctx->error = GPGME_Out_Of_Core; */
return;
}
q->item = item;
@@ -172,7 +172,7 @@ gpgme_op_trustlist_start (GpgmeCtx ctx, const char *pattern, int max_level)
GpgmeError err = 0;
if (!pattern || !*pattern)
- return mk_error (Invalid_Value);
+ return GPGME_Invalid_Value;
err = _gpgme_op_reset (ctx, 2);
if (err)
@@ -204,12 +204,12 @@ gpgme_op_trustlist_next (GpgmeCtx ctx, GpgmeTrustItem *r_item)
struct trust_queue_item_s *q;
if (!r_item)
- return mk_error (Invalid_Value);
+ return GPGME_Invalid_Value;
*r_item = NULL;
if (!ctx)
- return mk_error (Invalid_Value);
+ return GPGME_Invalid_Value;
if (!ctx->pending)
- return mk_error (No_Request);
+ return GPGME_No_Request;
if (!ctx->trust_queue)
{
@@ -231,7 +231,7 @@ gpgme_op_trustlist_next (GpgmeCtx ctx, GpgmeTrustItem *r_item)
if (!ctx->key_cond)
{
ctx->pending = 0;
- return mk_error (EOF);
+ return GPGME_EOF;
}
ctx->key_cond = 0;
assert (ctx->trust_queue);
@@ -256,9 +256,9 @@ GpgmeError
gpgme_op_trustlist_end (GpgmeCtx ctx)
{
if (!ctx)
- return mk_error (Invalid_Value);
+ return GPGME_Invalid_Value;
if (!ctx->pending)
- return mk_error (No_Request);
+ return GPGME_No_Request;
ctx->pending = 0;
return 0;