Merge r1951, r1952, r1953 from trunk:

* doc/ref/neon.xml: LFS doc tweak.

* src/ne_gnutls.c (ne_ssl_readable_dname): Remove unused variable.

* src/ne_gnutls.c (ne_ssl_clicert_import): Cast away warning.



git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.30.x@1954 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845

2 files changed, 9 insertions, 9 deletions

diff --git a/doc/ref/neon.xml b/doc/ref/neon.xml
index bada559..f65820c 100644
--- a/doc/ref/neon.xml
+++ b/doc/ref/neon.xml
@@ -261,14 +261,13 @@
     <title>Large File Support</title>
 
     <para>Since version 0.27.0, &neon; transparently uses the "LFS
-    transitional" interfaces in places where file-backed file
-    descriptors are manipulated.  This means files larger than 2GiB
-    can be handled on platforms with a native 32-bit
-    <literal>off_t</literal> type, where LFS support is
+    transitional" interfaces in functions which use file descriptors.
+    This allows use of files larger than 2GiB on platforms with a
+    native 32-bit <literal>off_t</literal> type, where LFS support is
     available.</para>
 
-    <para>Some interfaces use the <literal>ne_off_t</literal> type,
-    which is defined to be either <literal>off_t</literal> or
+    <para>Some &neon; interfaces use the <literal>ne_off_t</literal>
+    type, which is defined to be either <literal>off_t</literal> or
     <literal>off64_t</literal> according to whether LFS support is
     detected at build time.  &neon; does not use or require the
     <literal>-D_FILE_OFFSET_BITS=64</literal> macro definition.</para>
diff --git a/src/ne_gnutls.c b/src/ne_gnutls.c
index 485b9de..2982b2f 100644
--- a/src/ne_gnutls.c
+++ b/src/ne_gnutls.c
@@ -189,7 +189,7 @@ static void append_dirstring(ne_buffer *buf, gnutls_datum_t *data, unsigned long
 char *ne_ssl_readable_dname(const ne_ssl_dname *name)
 {
     gnutls_x509_dn_t dn;
-    int ret, rdn = 0, flag = 0;
+    int ret, rdn = 0;
     ne_buffer *buf;
     gnutls_x509_ava_st val;
 
@@ -227,7 +227,6 @@ char *ne_ssl_readable_dname(const ne_ssl_dname *name)
                 && ((!CMPOID(&val, OID_emailAddress)
                      && !CMPOID(&val, OID_commonName))
                     || (buf->used == 1 && rdn == 0))) {
-                flag = 1;
                 if (buf->used > 1) ne_buffer_append(buf, ", ", 2);
 
                 append_dirstring(buf, &val.value, val.value_tag);
@@ -1168,7 +1167,9 @@ ne_ssl_client_cert *ne_ssl_clicert_import(const unsigned char *buffer, size_t bu
     gnutls_x509_crt_t cert = NULL;
     gnutls_x509_privkey_t pkey = NULL;
 
-    data.data = buffer;
+    /* The datum structure is not modified by gnutls_pkcs12_import,
+     * cast safely: */
+    data.data = (unsigned char *)buffer;
     data.size = buflen;
 
     if (gnutls_pkcs12_init(&p12) != 0) {