doc/

2003-04-27  Marcus Brinkmann  <[email protected]>

	* gpgme.texi (Encrypting a Plaintext): Add info about
	GpgmeEncryptResult and gpgme_op_encrypt_result.

gpgme/
2003-04-27  Marcus Brinkmann  <[email protected]>

	* gpgme.h (GpgmeEncryptResult): New data type.
	(gpgme_op_encrypt_result): New prototype.
	* ops.h (_gpgme_op_encrypt_init_result): New prototype.
	(_gpgme_op_encrypt_status_handler): Fix prototype.
	* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Call
	_gpgme_op_encrypt_init_result.
	* encrypt.c: Do not include <stdio.h>, <assert.h>, "util.h" and
	"wait.h".  Include <errno.h> and "gpgme.h".
	(SKIP_TOKEN_OR_RETURN): Remove macro.
	(struct encrypt_result): Rename to ...
	(op_data_t): ... new data type.  Rewrite for user result data.
	(append_xml_encinfo): Remove function.
	(release_op_data): New function.
	(gpgme_op_encrypt_result): New function.
	(_gpgme_op_encrypt_status_handler): Change first argument to void *.
	Rewrite result parsing.
	(_gpgme_op_encrypt_sym_status_handler): Change first argument to
	void *.
	(_gpgme_op_encrypt_init_result): New function.
	(_gpgme_op_encrypt_start): Rename to ...
	(encrypt_start): ... this.
	(gpgme_op_encrypt_start): Use encrypt_start, not
	gpgme_op_encrypt_start.
	(gpgme_op_encrypt): Likewise.

tests/
2003-04-27  Marcus Brinkmann  <[email protected]>

	* gpg/t-sign.c: Rewritten.
	* gpgsm/t-sign.c: Rewritten.
	* gpg/t-encrypt.c: Check for invalid recipients.
	* gpgsm/t-encrypt.c: Likewise.

1 files changed, 14 insertions, 27 deletions

diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c
index 3f5a879c..a7530bae 100644
--- a/tests/gpgsm/t-genkey.c
+++ b/tests/gpgsm/t-genkey.c
@@ -38,38 +38,25 @@
   while (0)
 
 
-void
-dump_data (GpgmeData dh)
+static void
+print_data (GpgmeData dh)
 {
 #define BUF_SIZE 512
-  char buffer[BUF_SIZE + 1];
-  int bufread;
-
-  gpgme_data_rewind (dh);
-
-  do
-    {
-      bufread = gpgme_data_read (dh, buffer, BUF_SIZE);
-      if (bufread > 0)
-	{
-	  buffer[bufread] = '\0';
-	  printf ("%s", buffer);
-	}
-    }
-  while (bufread > 0);
-
-  if (bufread < 0)
-    {
-      fprintf (stderr, "%s:%d: gpgme_data_read failed: %s\n",
-	       __FILE__, __LINE__, strerror (errno));
-      exit (1);
-    }
-  printf ("\n");
+  char buf[BUF_SIZE + 1];
+  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, BUF_SIZE)) > 0)
+    fwrite (buf, ret, 1, stdout);
+  if (ret < 0)
+    fail_if_err (GPGME_File_Error);
 }
 
 
 /* True if progress function printed something on the screen.  */
-int progress_called;
+static int progress_called;
 
 static void
 progress (void *self, const char *what, int type, int current, int total)
@@ -156,7 +143,7 @@ main (int argc, char **argv)
     }
   gpgme_release (ctx);
 
-  dump_data (certreq);
+  print_data (certreq);
   gpgme_data_release (certreq);
 
   return 0;