diff options
author | Ken Raeburn <raeburn@mit.edu> | 2009-02-02 23:41:40 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2009-02-02 23:41:40 +0000 |
commit | d431a41a7a0f44ff2d0e5c69fb8a6901f72d0b55 (patch) | |
tree | e4f6373671367a5afb16e2cc1e4bbbf44ab015b7 /src/lib/rpc | |
parent | 2fbe8a9edf3b69e68c226a79dad0747f19decd0b (diff) | |
download | krb5-d431a41a7a0f44ff2d0e5c69fb8a6901f72d0b55.zip krb5-d431a41a7a0f44ff2d0e5c69fb8a6901f72d0b55.tar.gz krb5-d431a41a7a0f44ff2d0e5c69fb8a6901f72d0b55.tar.bz2 |
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
Diffstat (limited to 'src/lib/rpc')
-rw-r--r-- | src/lib/rpc/auth_gssapi.c | 8 | ||||
-rw-r--r-- | src/lib/rpc/get_myaddress.c | 2 | ||||
-rw-r--r-- | src/lib/rpc/svc_auth_gssapi.c | 6 | ||||
-rw-r--r-- | src/lib/rpc/svc_tcp.c | 2 | ||||
-rw-r--r-- | src/lib/rpc/svc_udp.c | 6 | ||||
-rw-r--r-- | src/lib/rpc/unit-test/rpc_test_clnt.c | 2 | ||||
-rw-r--r-- | src/lib/rpc/unit-test/rpc_test_svc.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/rpc/auth_gssapi.c b/src/lib/rpc/auth_gssapi.c index 7211156..69a4fd1 100644 --- a/src/lib/rpc/auth_gssapi.c +++ b/src/lib/rpc/auth_gssapi.c @@ -176,8 +176,8 @@ AUTH *auth_gssapi_create( rpc_createerr.cf_error.re_errno = ENOMEM; goto cleanup; } - memset((char *) auth, 0, sizeof(*auth)); - memset((char *) pdata, 0, sizeof(*pdata)); + memset(auth, 0, sizeof(*auth)); + memset(pdata, 0, sizeof(*pdata)); auth->ah_ops = &auth_gssapi_ops; auth->ah_private = (caddr_t) pdata; @@ -246,7 +246,7 @@ try_new_version: bindp = NULL; } - memset((char *) &call_res, 0, sizeof(call_res)); + memset(&call_res, 0, sizeof(call_res)); next_token: *gssstat = gss_init_sec_context(minor_stat, @@ -283,7 +283,7 @@ next_token: PRINTF(("gssapi_create: calling GSSAPI_INIT (%d)\n", init_func)); - memset((char *) &call_res, 0, sizeof(call_res)); + memset(&call_res, 0, sizeof(call_res)); callstat = clnt_call(clnt, init_func, xdr_authgssapi_init_arg, &call_arg, xdr_authgssapi_init_res, &call_res, diff --git a/src/lib/rpc/get_myaddress.c b/src/lib/rpc/get_myaddress.c index 884a19b..6ec0170 100644 --- a/src/lib/rpc/get_myaddress.c +++ b/src/lib/rpc/get_myaddress.c @@ -52,7 +52,7 @@ static char sccsid[] = "@(#)get_myaddress.c 1.4 87/08/11 Copyr 1984 Sun Micro"; int get_myaddress(struct sockaddr_in *addr) { - memset((void *) addr, 0, sizeof(*addr)); + memset(addr, 0, sizeof(*addr)); addr->sin_family = AF_INET; addr->sin_port = htons(PMAPPORT); addr->sin_addr.s_addr = htonl(INADDR_LOOPBACK); diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c index e374f00..e14a581 100644 --- a/src/lib/rpc/svc_auth_gssapi.c +++ b/src/lib/rpc/svc_auth_gssapi.c @@ -169,7 +169,7 @@ enum auth_stat gssrpc__svcauth_gssapi( /* use AUTH_NONE until there is a client_handle */ rqst->rq_xprt->xp_auth = &svc_auth_none; - memset((char *) &call_res, 0, sizeof(call_res)); + memset(&call_res, 0, sizeof(call_res)); creds.client_handle.length = 0; creds.client_handle.value = NULL; @@ -185,7 +185,7 @@ enum auth_stat gssrpc__svcauth_gssapi( PRINTF(("svcauth_gssapi: decoding credentials\n")); xdrmem_create(&xdrs, cred->oa_base, cred->oa_length, XDR_DECODE); - memset((char *) &creds, 0, sizeof(creds)); + memset(&creds, 0, sizeof(creds)); if (! xdr_authgssapi_creds(&xdrs, &creds)) { PRINTF(("svcauth_gssapi: failed decoding creds\n")); LOG_MISCERR("protocol error in client credentials"); @@ -691,7 +691,7 @@ static svc_auth_gssapi_data *create_client(void) client_data = (svc_auth_gssapi_data *) malloc(sizeof(*client_data)); if (client_data == NULL) return NULL; - memset((char *) client_data, 0, sizeof(*client_data)); + memset(client_data, 0, sizeof(*client_data)); L_PRINTF(2, ("create_client: new client_data = %p\n", (void *) client_data)); diff --git a/src/lib/rpc/svc_tcp.c b/src/lib/rpc/svc_tcp.c index 595723f..46c207a 100644 --- a/src/lib/rpc/svc_tcp.c +++ b/src/lib/rpc/svc_tcp.c @@ -156,7 +156,7 @@ svctcp_create( set_cloexec_fd(sock); madesock = TRUE; } - memset((char *)&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof (addr)); #if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN addr.sin_len = sizeof(addr); #endif diff --git a/src/lib/rpc/svc_udp.c b/src/lib/rpc/svc_udp.c index f4cbddd..232872d 100644 --- a/src/lib/rpc/svc_udp.c +++ b/src/lib/rpc/svc_udp.c @@ -123,7 +123,7 @@ svcudp_bufcreate( set_cloexec_fd(sock); madesock = TRUE; } - memset((char *)&addr, 0, sizeof (addr)); + memset(&addr, 0, sizeof (addr)); #if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN addr.sin_len = sizeof(addr); #endif @@ -194,7 +194,7 @@ svcudp_recv( uint32_t replylen; again: - memset((char *) &dummy, 0, sizeof(dummy)); + memset(&dummy, 0, sizeof(dummy)); dummy_iov[0].iov_base = rpc_buffer(xprt); dummy_iov[0].iov_len = (int) su->su_iosz; dummy.msg_iov = dummy_iov; @@ -337,7 +337,7 @@ svcudp_destroy(register SVCXPRT *xprt) (type *) mem_alloc((unsigned) (sizeof(type) * (size))) #define BZERO(addr, type, size) \ - memset((char *) addr, 0, sizeof(type) * (int) (size)) + memset(addr, 0, sizeof(type) * (int) (size)) /* * An entry in the cache diff --git a/src/lib/rpc/unit-test/rpc_test_clnt.c b/src/lib/rpc/unit-test/rpc_test_clnt.c index 7363925..4e4a18a 100644 --- a/src/lib/rpc/unit-test/rpc_test_clnt.c +++ b/src/lib/rpc/unit-test/rpc_test_clnt.c @@ -11,7 +11,7 @@ rpc_test_echo_1(argp, clnt) { static char *clnt_res; - memset((char *)&clnt_res, 0, sizeof (clnt_res)); + memset(&clnt_res, 0, sizeof (clnt_res)); if (clnt_call(clnt, RPC_TEST_ECHO, (xdrproc_t) xdr_wrapstring, (caddr_t) argp, (xdrproc_t) xdr_wrapstring, (caddr_t) &clnt_res, diff --git a/src/lib/rpc/unit-test/rpc_test_svc.c b/src/lib/rpc/unit-test/rpc_test_svc.c index 4200d95..61b51e0 100644 --- a/src/lib/rpc/unit-test/rpc_test_svc.c +++ b/src/lib/rpc/unit-test/rpc_test_svc.c @@ -53,7 +53,7 @@ rpc_test_prog_1_svc(rqstp, transp) _rpcsvcstate = _SERVED; return; } - (void) memset((char *)&argument, 0, sizeof (argument)); + (void) memset(&argument, 0, sizeof (argument)); if (!svc_getargs(transp, xdr_argument, &argument)) { svcerr_decode(transp); _rpcsvccount--; |