1 files changed, 11 insertions, 9 deletions
diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index 0c85d1be..276f7e6d 100644
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -42,21 +42,23 @@ struct passphrase_cb_info_s
                    exit (1); }					\
                              } while(0)
 
+
 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)
 {