2639. [bug] Silence compiler warnings in gssapi code. [RT #19954]

diff --git a/CHANGES b/CHANGES
index 8890ce52075aea93ae7425fb95f20821460e81c6..674f88c6fc18afc0a2b9a413313c7c3c0075ded7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2639.  [bug]           Silence compiler warnings in gssapi code. [RT #19954]
+
 2637.  [func]          Rationalize dnssec-signzone's signwithkey() calling.
                        [RT #19959]
 

diff --git a/lib/dns/spnego.c b/lib/dns/spnego.c
index 8704e4bb1cc7684052ee52d4ce7bb15ac409e085..6c94e51baeead4bb38dab03c06a7eacba04fa6c9 100644 (file)
--- a/lib/dns/spnego.c
+++ b/lib/dns/spnego.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: spnego.c,v 1.8.118.3 2009/07/20 01:54:46 marka Exp $ */
+/* $Id: spnego.c,v 1.8.118.4 2009/07/21 07:27:13 marka Exp $ */
 
 /*! \file
  * \brief
@@ -265,8 +265,7 @@ decode_oid(const unsigned char *p, size_t len,
           oid * k, size_t * size);
 
 static int
-decode_enumerated(const unsigned char *p, size_t len,
-                 unsigned *num, size_t *size);
+decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size);
 
 static int
 decode_octet_string(const unsigned char *, size_t, octet_string *, size_t *);
@@ -291,8 +290,7 @@ der_put_length_and_tag(unsigned char *, size_t, size_t,
                       Der_class, Der_type, int, size_t *);
 
 static int
-encode_enumerated(unsigned char *p, size_t len,
-                 const unsigned *data, size_t *);
+encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *);
 
 static int
 encode_octet_string(unsigned char *p, size_t len,
@@ -956,8 +954,7 @@ der_match_tag_and_length(const unsigned char *p, size_t len,
 }
 
 static int
-decode_enumerated(const unsigned char *p, size_t len,
-                 unsigned *num, size_t *size)
+decode_enumerated(const unsigned char *p, size_t len, void *num, size_t *size)
 {
        size_t ret = 0;
        size_t l, reallen;
@@ -1269,10 +1266,9 @@ der_put_length_and_tag(unsigned char *p, size_t len, size_t len_val,
 }
 
 static int
-encode_enumerated(unsigned char *p, size_t len, const unsigned *data,
-                 size_t *size)
+encode_enumerated(unsigned char *p, size_t len, const void *data, size_t *size)
 {
-       unsigned num = *data;
+       unsigned num = *(const unsigned *)data;
        size_t ret = 0;
        size_t l;
        int e;