[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_3-5-g4a711db
From: |
Simon Josefsson |
Subject: |
[SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_3-5-g4a711db |
Date: |
Fri, 28 Aug 2009 13:02:22 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=4a711dbb226fcc9425a57857753c4196c759fc11
The branch, gnutls_2_8_x has been updated
via 4a711dbb226fcc9425a57857753c4196c759fc11 (commit)
from 944626fe48f7b469f78f363bb726d895f49bf46c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4a711dbb226fcc9425a57857753c4196c759fc11
Author: Dan Fandrich <address@hidden>
Date: Thu Aug 27 17:02:17 2009 -0700
Fix compiler warning bugs for OpenWatcom.
Signed-off-by: Simon Josefsson <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
lib/opencdk/new-packet.c | 4 ++--
lib/opencdk/packet.h | 12 ++++++------
lib/opencdk/pubkey.c | 2 +-
lib/opencdk/read-packet.c | 6 +++---
lib/opencdk/stream.c | 4 ++--
lib/opencdk/stream.h | 2 +-
lib/opencdk/verify.c | 2 +-
lib/x509/crq.c | 4 +++-
8 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/lib/opencdk/new-packet.c b/lib/opencdk/new-packet.c
index 501d652..9159af0 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 a2dc7fb..4e3f5a5 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 2e44bfc..bcaf9ef 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 2869c2c..e599f5e 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 48757e9..2701424 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 3291e3a..977d675 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 4bf4f67..e6e560f 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 67ecdbc..95e6618 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -621,7 +621,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)
{
hooks/post-receive
--
GNU gnutls
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, gnutls_2_8_x, updated. gnutls_2_8_3-5-g4a711db,
Simon Josefsson <=