aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg/t-signers.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--tests/gpg/t-signers.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c
index d0aa00b3..2e8d3f41 100644
--- a/tests/gpg/t-signers.c
+++ b/tests/gpg/t-signers.c
@@ -33,34 +33,36 @@
} while(0)
static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
{
- char *s = gpgme_get_op_info (c, 0);
+ char *str = gpgme_get_op_info (ctx, 0);
- if (!s)
+ if (!str)
puts ("<!-- no operation info available -->");
else
{
- puts (s);
- free (s);
+ puts (str);
+ free (str);
}
}
+
static void
print_data (GpgmeData dh)
{
char buf[100];
- size_t nread;
- GpgmeError err;
-
- err = gpgme_data_rewind (dh);
- fail_if_err (err);
- while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
- fwrite (buf, nread, 1, stdout);
- if (err != GPGME_EOF)
- fail_if_err (err);
+ int ret;
+
+ ret = gpgme_data_seek (dh, 0, SEEK_SET);
+ if (ret)
+ fail_if_err (GPGME_File_Error);
+ while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
+ fwrite (buf, ret, 1, stdout);
+ if (ret < 0)
+ fail_if_err (GPGME_File_Error);
}
+
static const char *
passphrase_cb (void *opaque, const char *desc, void **r_hd)
{