1 files changed, 20 insertions, 21 deletions
diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 9a7358c2..54096245 100644
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -33,37 +33,36 @@
                              } while(0)
 
 static void
-print_op_info (GpgmeCtx c)
+print_op_info (GpgmeCtx ctx)
 {
-    char *s = gpgme_get_op_info (c, 0);
-
-    if (!s)
-        puts ("<!-- no operation info available -->");
-    else {
-        puts (s);
-        free (s);
+  char *str = gpgme_get_op_info (ctx, 0);
+
+  if (!str)
+    puts ("<!-- no operation info available -->");
+  else
+    {
+      puts (str);
+      free (str);
     }
 }
 
 
 static void
-print_data ( GpgmeData dh )
+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);
+  char buf[100];
+  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);
 }
 
 
-
 int 
 main (int argc, char **argv )
 {