From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 28 Aug 2009 00:02:17 +0000 (-0700)
Subject: Fix compiler warning bugs for OpenWatcom.
X-Git-Tag: gnutls_2_9_4~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b07f58ce787e9508d6ee33fbe6001ea81987390f;p=thirdparty%2Fgnutls.git

Fix compiler warning bugs for OpenWatcom.

Signed-off-by: Simon Josefsson <simon@josefsson.org>
---

diff --git a/lib/opencdk/new-packet.c b/lib/opencdk/new-packet.c
index 501d65293f..9159af0043 100644
--- a/lib/opencdk/new-packet.c
+++ b/lib/opencdk/new-packet.c
@@ -388,7 +388,7 @@ _cdk_copy_userid (cdk_pkt_userid_t * dst, cdk_pkt_userid_t src)
   u = cdk_calloc (1, sizeof *u + strlen (src->name) + 2);
   if (!u)
     return CDK_Out_Of_Core;
-  u->name = (void*)u + sizeof(*u);
+  u->name = (char*)u + sizeof(*u);
 
   memcpy (u, src, sizeof *u);
   memcpy (u->name, src->name, strlen (src->name));
@@ -627,7 +627,7 @@ cdk_subpkt_new (size_t size)
   s = cdk_calloc (1, sizeof *s + size + 2);
   if (!s)
     return NULL;
-  s->d = (void*)s + sizeof(*s);
+  s->d = (char*)s + sizeof(*s);
 
   return s;
 }
diff --git a/lib/opencdk/packet.h b/lib/opencdk/packet.h
index a2dc7fba07..4e3f5a55b1 100644
--- a/lib/opencdk/packet.h
+++ b/lib/opencdk/packet.h
@@ -37,12 +37,12 @@ void _cdk_free_mpibuf (size_t n, bigint_t *array);
 void _cdk_free_userid (cdk_pkt_userid_t uid);
 void _cdk_free_signature( cdk_pkt_signature_t sig );
 cdk_prefitem_t _cdk_copy_prefs( const cdk_prefitem_t prefs );
-int _cdk_copy_userid( cdk_pkt_userid_t *dst, cdk_pkt_userid_t src );
-int _cdk_copy_pubkey( cdk_pkt_pubkey_t* dst, cdk_pkt_pubkey_t src );
-int _cdk_copy_seckey( cdk_pkt_seckey_t* dst, cdk_pkt_seckey_t src );
-int _cdk_copy_pk_to_sk( cdk_pkt_pubkey_t pk, cdk_pkt_seckey_t sk );
-int _cdk_copy_signature( cdk_pkt_signature_t* dst, cdk_pkt_signature_t src );
-int _cdk_pubkey_compare( cdk_pkt_pubkey_t a, cdk_pkt_pubkey_t b );
+cdk_error_t _cdk_copy_userid( cdk_pkt_userid_t *dst, cdk_pkt_userid_t src );
+cdk_error_t _cdk_copy_pubkey( cdk_pkt_pubkey_t* dst, cdk_pkt_pubkey_t src );
+cdk_error_t _cdk_copy_seckey( cdk_pkt_seckey_t* dst, cdk_pkt_seckey_t src );
+cdk_error_t _cdk_copy_pk_to_sk( cdk_pkt_pubkey_t pk, cdk_pkt_seckey_t sk );
+cdk_error_t _cdk_copy_signature( cdk_pkt_signature_t* dst, cdk_pkt_signature_t src );
+cdk_error_t _cdk_pubkey_compare( cdk_pkt_pubkey_t a, cdk_pkt_pubkey_t b );
 
 #endif /* CDK_PACKET_H */
 
diff --git a/lib/opencdk/pubkey.c b/lib/opencdk/pubkey.c
index 2e44bfcf03..bcaf9eff6f 100644
--- a/lib/opencdk/pubkey.c
+++ b/lib/opencdk/pubkey.c
@@ -646,7 +646,7 @@ _cdk_pkt_get_keyid (cdk_packet_t pkt, u32 * keyid)
 
 
 /* Get the fingerprint of the packet if possible. */
-int
+cdk_error_t
 _cdk_pkt_get_fingerprint (cdk_packet_t pkt, byte * fpr)
 {
   if (!pkt || !fpr)
diff --git a/lib/opencdk/read-packet.c b/lib/opencdk/read-packet.c
index 1f5008e2dd..97e844be0f 100644
--- a/lib/opencdk/read-packet.c
+++ b/lib/opencdk/read-packet.c
@@ -836,7 +836,7 @@ read_literal (cdk_stream_t inp, size_t pktlen,
       *ret_pt = pt = cdk_realloc (pt, sizeof *pt + pt->namelen + 2);
       if (!pt)
 	return CDK_Out_Of_Core;
-      pt->name = (void*)pt + sizeof(*pt);
+      pt->name = (char*)pt + sizeof(*pt);
       rc = stream_read (inp, pt->name, pt->namelen, &nread);
       if (rc)
 	return rc;
@@ -998,7 +998,7 @@ cdk_pkt_read (cdk_stream_t inp, cdk_packet_t pkt)
 				     + pkt->pktlen + 16 + 1);
       if (!pkt->pkt.user_id)
 	return CDK_Out_Of_Core;
-      pkt->pkt.user_id->name = (void*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
+      pkt->pkt.user_id->name = (char*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
 
       rc = read_attribute (inp, pktlen, pkt->pkt.user_id);
       pkt->pkttype = CDK_PKT_ATTRIBUTE;
@@ -1009,7 +1009,7 @@ cdk_pkt_read (cdk_stream_t inp, cdk_packet_t pkt)
 				     + pkt->pktlen + 1);
       if (!pkt->pkt.user_id)
 	return CDK_Out_Of_Core;
-      pkt->pkt.user_id->name = (void*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
+      pkt->pkt.user_id->name = (char*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
       rc = read_user_id (inp, pktlen, pkt->pkt.user_id);
       break;
 
diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index 7171371a7d..eaeb637587 100644
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -43,8 +43,8 @@
 /* This is the maximal amount of bytes we map. */
 #define MAX_MAP_SIZE 16777216
 
-static int stream_flush (cdk_stream_t s);
-static int stream_filter_write (cdk_stream_t s);
+static cdk_error_t stream_flush (cdk_stream_t s);
+static cdk_error_t stream_filter_write (cdk_stream_t s);
 static int stream_cache_flush (cdk_stream_t s, FILE * fp);
 struct stream_filter_s *filter_add (cdk_stream_t s, filter_fnct_t fnc,
 				    int type);
diff --git a/lib/opencdk/stream.h b/lib/opencdk/stream.h
index 3291e3a013..977d675b0b 100644
--- a/lib/opencdk/stream.h
+++ b/lib/opencdk/stream.h
@@ -38,7 +38,7 @@ enum {
 };
 
 /* Type definition for the filter function. */
-typedef int (*filter_fnct_t) (void * opaque, int ctl, FILE * in, FILE * out);
+typedef cdk_error_t (*filter_fnct_t) (void * opaque, int ctl, FILE * in, FILE * out);
 
 /* The stream filter context structure. */
 struct stream_filter_s 
diff --git a/lib/opencdk/verify.c b/lib/opencdk/verify.c
index 4bf4f67249..e6e560fae1 100644
--- a/lib/opencdk/verify.c
+++ b/lib/opencdk/verify.c
@@ -58,7 +58,7 @@ struct
 };
 
 
-static int file_verify_clearsign (cdk_ctx_t, const char *, const char *);
+static cdk_error_t file_verify_clearsign (cdk_ctx_t, const char *, const char *);
 
 
 /**
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index afb7dd3188..6a840d6f2a 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -610,7 +610,9 @@ gnutls_x509_crq_set_attribute_by_oid (gnutls_x509_crq_t crq,
 				      const char *oid, void *buf,
 				      size_t sizeof_buf)
 {
-  gnutls_datum data = { buf, sizeof_buf };
+  gnutls_datum data;
+  data.data = buf;
+  data.size = sizeof_buf;
 
   if (crq == NULL)
     {