From: Hangbin L. <liu...@gm...> - 2013-07-12 07:01:52
|
Use memset as bzero has been deprecated Signed-off-by: Hangbin Liu <liu...@gm...> --- src/apps/sctp_darn.c | 4 ++-- src/apps/sctp_test.c | 4 ++-- src/func_tests/test_getname.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/apps/sctp_darn.c b/src/apps/sctp_darn.c index 2ae0a20..2cef7a9 100644 --- a/src/apps/sctp_darn.c +++ b/src/apps/sctp_darn.c @@ -1467,7 +1467,7 @@ append_addr(const char *parm, struct sockaddr *addrs, int *ret_count) if (NULL != hst4) { for (j = 0; j < i4; ++j) { b4ap = (struct sockaddr_in *)aptr; - bzero(b4ap, sizeof(*b4ap)); + memset(b4ap, 0x00, sizeof(*b4ap)); b4ap->sin_family = AF_INET; b4ap->sin_port = htons(local_port); bcopy(hst4->h_addr_list[j], &b4ap->sin_addr, @@ -1480,7 +1480,7 @@ append_addr(const char *parm, struct sockaddr *addrs, int *ret_count) if (NULL != hst6) { for (j = 0; j < i6; ++j) { b6ap = (struct sockaddr_in6 *)aptr; - bzero(b6ap, sizeof(*b6ap)); + memset(b6ap, 0x00, sizeof(*b6ap)); b6ap->sin6_family = AF_INET6; b6ap->sin6_port = htons(local_port); b6ap->sin6_scope_id = if_index; diff --git a/src/apps/sctp_test.c b/src/apps/sctp_test.c index bab3668..2aaf9d3 100644 --- a/src/apps/sctp_test.c +++ b/src/apps/sctp_test.c @@ -551,7 +551,7 @@ append_addr(const char *parm, struct sockaddr *addrs, int *ret_count) if (NULL != hst4) { for (j = 0; j < i4; ++j) { b4ap = (struct sockaddr_in *)aptr; - bzero(b4ap, sizeof(*b4ap)); + memset(b4ap, 0x00, sizeof(*b4ap)); b4ap->sin_family = AF_INET; b4ap->sin_port = htons(local_port); bcopy(hst4->h_addr_list[j], &b4ap->sin_addr, @@ -564,7 +564,7 @@ append_addr(const char *parm, struct sockaddr *addrs, int *ret_count) if (NULL != hst6) { for (j = 0; j < i6; ++j) { b6ap = (struct sockaddr_in6 *)aptr; - bzero(b6ap, sizeof(*b6ap)); + memset(b6ap, 0x00, sizeof(*b6ap)); b6ap->sin6_family = AF_INET6; b6ap->sin6_port = htons(local_port); b6ap->sin6_scope_id = if_index; diff --git a/src/func_tests/test_getname.c b/src/func_tests/test_getname.c index d7011f6..2340de6 100644 --- a/src/func_tests/test_getname.c +++ b/src/func_tests/test_getname.c @@ -89,7 +89,7 @@ main(int argc, char *argv[]) svr_sk = test_socket(pf_class, SOCK_STREAM, IPPROTO_SCTP); test_bind(svr_sk, &svr_loop.sa, sizeof(svr_loop)); - bzero(&svr_local_addr, sizeof(svr_local_addr)); + memset(&svr_local_addr, 0x00, sizeof(svr_local_addr)); len = sizeof(svr_local_addr); /* Verify that getsockname() on an unconnected socket works fine. */ error = getsockname(svr_sk, (struct sockaddr *)&svr_local_addr, &len); @@ -98,7 +98,7 @@ main(int argc, char *argv[]) tst_resm(TPASS, "getsockname on an unconnected socket"); - bzero(&svr_peer_addr, sizeof(svr_peer_addr)); + memset(&svr_peer_addr, 0x00, sizeof(svr_peer_addr)); len = sizeof(svr_peer_addr); /* Verify that getpeername() on an unconnected socket fails. */ error = getpeername(svr_sk, (struct sockaddr *)&svr_peer_addr, &len); @@ -122,7 +122,7 @@ main(int argc, char *argv[]) #endif test_connect(clt_sk, &svr_loop.sa, sizeof(svr_loop)); - bzero(&clt_local_addr, sizeof(clt_local_addr)); + memset(&clt_local_addr, 0x00, sizeof(clt_local_addr)); len = sizeof(clt_local_addr); /* Get the client's local address. */ error = getsockname(clt_sk, (struct sockaddr *)&clt_local_addr, &len); @@ -132,7 +132,7 @@ main(int argc, char *argv[]) tst_resm(TPASS, "getsockname on a connected client socket"); - bzero(&clt_peer_addr, sizeof(clt_peer_addr)); + memset(&clt_peer_addr, 0x00, sizeof(clt_peer_addr)); len = sizeof(clt_peer_addr); /* Get the client's peer address. */ error = getpeername(clt_sk, (struct sockaddr *)&clt_peer_addr, &len); @@ -146,7 +146,7 @@ main(int argc, char *argv[]) len = sizeof(accept_loop); accept_sk = test_accept(svr_sk, &accept_loop.sa, &len); - bzero(&svr_local_addr, sizeof(svr_local_addr)); + memset(&svr_local_addr, 0x00, sizeof(svr_local_addr)); len = sizeof(svr_local_addr); /* Get the server's local address. */ error = getsockname(accept_sk, (struct sockaddr *)&svr_local_addr, @@ -157,7 +157,7 @@ main(int argc, char *argv[]) tst_resm(TPASS, "getsockname on a connected server socket"); - bzero(&svr_peer_addr, sizeof(svr_peer_addr)); + memset(&svr_peer_addr, 0x00, sizeof(svr_peer_addr)); len = sizeof(svr_peer_addr); /* Get the server's peer address. */ error = getpeername(accept_sk, (struct sockaddr *)&svr_peer_addr, @@ -197,7 +197,7 @@ main(int argc, char *argv[]) #endif tst_resm(TPASS, "getsockname/getpeername server/client match"); - bzero(&clt_local_addr, sizeof(clt_local_addr)); + memset(&clt_local_addr, 0x00, sizeof(clt_local_addr)); len = sizeof(clt_local_addr); /*getsockname(): Bad socket descriptor, EBADF expected error*/ error = getsockname(-1, (struct sockaddr *)&clt_local_addr, &len); @@ -223,7 +223,7 @@ main(int argc, char *argv[]) tst_resm(TPASS, "getsockname with invalid buffer - EFAULT"); - bzero(&clt_peer_addr, sizeof(clt_peer_addr)); + memset(&clt_peer_addr, 0x00, sizeof(clt_peer_addr)); len = sizeof(clt_peer_addr); /*getpeername(): Bad socket descriptor, EBADF expected error*/ error = getpeername(-1, (struct sockaddr *)&clt_local_addr, &len); -- 1.8.1.4 |
From: Neil H. <nh...@tu...> - 2013-07-12 11:23:50
|
On Fri, Jul 12, 2013 at 03:01:25PM +0800, Hangbin Liu wrote: > Use memset as bzero has been deprecated > > Signed-off-by: Hangbin Liu <liu...@gm...> Acked-by: Neil Horman <nh...@tu...> |
From: Daniel B. <dbo...@re...> - 2013-07-12 11:50:45
|
On 07/12/2013 01:23 PM, Neil Horman wrote: > On Fri, Jul 12, 2013 at 03:01:25PM +0800, Hangbin Liu wrote: >> Use memset as bzero has been deprecated >> >> Signed-off-by: Hangbin Liu <liu...@gm...> > Acked-by: Neil Horman <nh...@tu...> Applied, thanks. |