Remove unnecessary pointer casts in args to free,memcpy,memset,memchr except unicode, windows code

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21875 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/gssapi/generic/gssapiP_generic.h b/src/lib/gssapi/generic/gssapiP_generic.h
index b684055c4..cb2340a4b 100644
--- a/src/lib/gssapi/generic/gssapiP_generic.h
+++ b/src/lib/gssapi/generic/gssapiP_generic.h
@@ -75,7 +75,7 @@ typedef UINT64_TYPE gssint_uint64;
    (ptr) += 2;
 
 #define TWRITE_STR(ptr, str, len)               \
-   memcpy((ptr), (char *) (str), (len));        \
+   memcpy((ptr), (str), (len));                 \
    (ptr) += (len);
 
 #define TREAD_STR(ptr, str, len)                \
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index f91c7525e..631cbe080 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -131,7 +131,7 @@ static krb5_error_code get_credentials(context, cred, server, now,
     krb5_creds          in_creds;
 
     k5_mutex_assert_locked(&cred->lock);
-    memset((char *) &in_creds, 0, sizeof(krb5_creds));
+    memset(&in_creds, 0, sizeof(krb5_creds));
     in_creds.client = in_creds.server = NULL;
 
     if ((code = krb5_copy_principal(context, cred->princ, &in_creds.client)))
diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c
index a8558a594..a800c1582 100644
--- a/src/lib/gssapi/krb5/util_crypt.c
+++ b/src/lib/gssapi/krb5/util_crypt.c
@@ -345,10 +345,10 @@ kg_arcfour_docrypt (const krb5_keyblock *longterm_key , int ms_usage,
                  &seq_enc_key, 0,
                  &input, &output));
 cleanup_arcfour:
-    memset ((void *) seq_enc_key.contents, 0, seq_enc_key.length);
-    memset ((void *) usage_key.contents, 0, usage_key.length);
-    free ((void *) usage_key.contents);
-    free ((void *) seq_enc_key.contents);
+    memset (seq_enc_key.contents, 0, seq_enc_key.length);
+    memset (usage_key.contents, 0, usage_key.length);
+    free (usage_key.contents);
+    free (seq_enc_key.contents);
     return (code);
 }
 
@@ -713,10 +713,10 @@ kg_arcfour_docrypt_iov (krb5_context context,
                  &seq_enc_key, 0,
                  kiov, kiov_count));
 cleanup_arcfour:
-    memset ((void *) seq_enc_key.contents, 0, seq_enc_key.length);
-    memset ((void *) usage_key.contents, 0, usage_key.length);
-    free ((void *) usage_key.contents);
-    free ((void *) seq_enc_key.contents);
+    memset (seq_enc_key.contents, 0, seq_enc_key.length);
+    memset (usage_key.contents, 0, usage_key.length);
+    free (usage_key.contents);
+    free (seq_enc_key.contents);
     if (kiov != NULL)
         free(kiov);
     return (code);
diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index 5321de0be..3a6653caf 100644
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -2374,7 +2374,7 @@ put_mech_oid(unsigned char **buf_out, gss_OID_const mech, unsigned int buflen)
 		return (-1);
 	*(*buf_out)++ = MECH_OID;
 	*(*buf_out)++ = (unsigned char) mech->length;
-	memcpy((void *)(*buf_out), mech->elements, mech->length);
+	memcpy(*buf_out, mech->elements, mech->length);
 	*buf_out += mech->length;
 	return (0);
 }