[GPGME] GpgME cannot be compiled in Alpha

[Marcus Brinkmann]

On Thu, Nov 01, 2001 at 04:40:08PM +0100, Jose Carlos Garcia Sogo wrote:
>   I'd like that somebody here with an alpha available could try to test
>  where the problem is.

I have made a test on a remote alpha running Debian 2.2, and as far as I
could go it compiled fine (I had no gpg on this machine, so I couldn't run
the tests).  I attach a diff below which fixes all warnings.
 
>   Well, I could also upload a new package with the patch applied and let
>  the autobuilders do the test job, but I think that this way is a bit
>  barbarian ;)

I think it is safe to do this.

Thanks,
Marcus

diff -x *~ -x CVS -ru cvs/gpgme/gpgme/ChangeLog gpgme/gpgme/ChangeLog
--- cvs/gpgme/gpgme/ChangeLog	Mon Oct 29 01:05:04 2001
+++ gpgme/gpgme/ChangeLog	Fri Nov  2 16:47:04 2001
@@ -1,3 +1,11 @@
+2001-11-02  Marcus Brinkmann  <marcus at g10code.de>
+
+	* rungpg.c (pipemode_copy): Change type of NBYTES to size_t.
+
+	* key.c: Include string.h.
+	* data.c: Likewise.
+	* recipient.c: Likewise.
+
 2001-10-29  Marcus Brinkmann  <marcus at g10code.de>
 
 	* context.h: New member signers_len.
diff -x *~ -x CVS -ru cvs/gpgme/gpgme/data.c gpgme/gpgme/data.c
--- cvs/gpgme/gpgme/data.c	Mon Oct 22 16:15:01 2001
+++ gpgme/gpgme/data.c	Fri Nov  2 16:37:18 2001
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
diff -x *~ -x CVS -ru cvs/gpgme/gpgme/key.c gpgme/gpgme/key.c
--- cvs/gpgme/gpgme/key.c	Mon Sep 17 10:25:35 2001
+++ gpgme/gpgme/key.c	Fri Nov  2 16:38:28 2001
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include "util.h"
diff -x *~ -x CVS -ru cvs/gpgme/gpgme/recipient.c gpgme/gpgme/recipient.c
--- cvs/gpgme/gpgme/recipient.c	Mon Sep 17 10:25:36 2001
+++ gpgme/gpgme/recipient.c	Fri Nov  2 16:37:35 2001
@@ -22,6 +22,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include "util.h"
diff -x *~ -x CVS -ru cvs/gpgme/gpgme/rungpg.c gpgme/gpgme/rungpg.c
--- cvs/gpgme/gpgme/rungpg.c	Tue Jul 31 17:21:57 2001
+++ gpgme/gpgme/rungpg.c	Fri Nov  2 16:39:27 2001
@@ -1275,7 +1275,7 @@
 pipemode_copy (char *buffer, size_t length, size_t *nread, GpgmeData data )
 {
     GpgmeError err;
-    int nbytes;
+    size_t nbytes;
     char tmp[1000], *s, *d;
 
     /* we can optimize this whole thing but for now we just
diff -x *~ -x CVS -ru cvs/gpgme/tests/.#ChangeLog.1.5 gpgme/tests/.#ChangeLog.1.5
--- cvs/gpgme/tests/.#ChangeLog.1.5	Mon Oct 29 01:02:39 2001
+++ gpgme/tests/.#ChangeLog.1.5	Fri Nov  2 16:42:45 2001
@@ -1,7 +1,9 @@
-2001-10-29  Marcus Brinkmann  <marcus at g10code.de>
+2001-11-02  Marcus Brinkmann  <marcus at g10code.de>
 
-	* t-signers.c: New file.
-	* Makefile.am (TESTS): Add t-signers.
+	* t-data.c: Include stddef.h.
+	(read_once_test): Change type of READ to size_t.
+	(read_test): Likewise.
+	(write_test): Likewise.
 
 2001-10-22  Marcus Brinkmann  <marcus at g10code.de>
 
diff -x *~ -x CVS -ru cvs/gpgme/tests/ChangeLog gpgme/tests/ChangeLog
--- cvs/gpgme/tests/ChangeLog	Mon Oct 29 01:03:45 2001
+++ gpgme/tests/ChangeLog	Fri Nov  2 16:47:57 2001
@@ -1,3 +1,10 @@
+2001-11-02  Marcus Brinkmann  <marcus at g10code.de>
+
+	* t-data.c: Include stddef.h.
+	(read_once_test): Change type of READ to size_t.
+	(read_test): Likewise.
+	(write_test): Likewise.
+
 2001-10-29  Marcus Brinkmann  <marcus at g10code.de>
 
 	* t-signers.c: New file.
diff -x *~ -x CVS -ru cvs/gpgme/tests/t-data.c gpgme/tests/t-data.c
--- cvs/gpgme/tests/t-data.c	Mon Oct 22 16:14:14 2001
+++ gpgme/tests/t-data.c	Fri Nov  2 16:42:38 2001
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
+#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -107,7 +108,7 @@
 {
   GpgmeError err;
   char buffer[1024];
-  int read;
+  size_t read;
 
   err = gpgme_data_read (data, buffer, sizeof (buffer), &read);
   fail_if_err (err);
@@ -133,7 +134,7 @@
 {
   GpgmeError err;
   char buffer[1024];
-  int read;
+  size_t read;
 
   if (round == TEST_INOUT_NONE)
     {
@@ -158,7 +159,7 @@
 {
   GpgmeError err;
   char buffer[1024];
-  int read;
+  size_t read;
 
   err = gpgme_data_write (data, text, strlen (text));
   fail_if_err (err);

-- 
`Rhubarb is no Egyptian god.' Debian http://www.debian.org brinkmd at debian.org
Marcus Brinkmann              GNU    http://www.gnu.org    marcus at gnu.org
Marcus.Brinkmann at ruhr-uni-bochum.de
http://www.marcus-brinkmann.de