diff options
Diffstat (limited to '')
| -rw-r--r-- | tests/gpg/t-eventloop.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c index 634911af..887de64c 100644 --- a/tests/gpg/t-eventloop.c +++ b/tests/gpg/t-eventloop.c @@ -37,14 +37,14 @@ static void print_op_info (GpgmeCtx ctx) { - char *s = gpgme_get_op_info (ctx, 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); } } @@ -53,15 +53,15 @@ 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); } @@ -203,7 +203,7 @@ main (int argc, char *argv[]) for (i = 0; i < FDLIST_MAX; i++) fdlist[i].fd = -1; - err = gpgme_check_engine (); + err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); fail_if_err (err); puts (gpgme_get_engine_info ()); |