Replace bzero() with memset()
PATCH 1/2 Replace bzero() with memset()
bzero() is deprecated.
Signed-off-by Petr Vorel <[email protected]>
--- lib/tlibio.c | 2 +- testcases/kernel/fs/read_all/read_all.c | 3 ++- .../kernel/hotplug/memory_hotplug/memtoy.c | 2 +- .../kernel/syscalls/epoll_ctl/epoll_ctl01.c | 4 ++-- .../kernel/syscalls/epoll_wait/epoll_wait01.c | 3 +-- .../tirpc_simple_rpc_call/tirpc_rpc_call.c | 1 + .../tirpc_rpc_call_performance.c | 1 + .../tirpc_rpc_call_stress.c | 1 + .../rpc-tirpc/tests_pack/rpc_svc_2/rpc_svc_2.c | 1 + .../tests_pack/tirpc_svc_11/tirpc_svc_11.c | 1 + .../tests_pack/tirpc_svc_3/tirpc_svc_3.c | 1 + .../tests_pack/tirpc_svc_4/tirpc_svc_4.c | 1 + .../tests_pack/tirpc_svc_5/tirpc_svc_5.c | 1 + .../tests_pack/tirpc_svc_6/tirpc_svc_6.c | 1 + .../tests_pack/tirpc_svc_7/tirpc_svc_7.c | 1 + .../tests_pack/tirpc_svc_8/tirpc_svc_8.c | 1 + .../tests_pack/tirpc_svc_9/tirpc_svc_9.c | 1 + utils/sctp/func_tests/test_getname.c | 17 ++++++++--------- 18 files changed, 27 insertions(+), 16 deletions(-)
lib/tlibio.c +1 -1
@@ -105,7 +105,7 @@#else /* for linux or sgi */ #include <sys/uio.h> /* readv(2)/writev(2) */ -#include <string.h> /* bzero */ +#include <string.h> #endif #if defined(__linux__) || defined(__sun) || defined(__hpux) || defined(_AIX)#if !defined(UCLINUX ) && !defined(__UCLIBC__)
testcases/kernel/fs/read_all/read_all.c +2 -1
@@ -31,6 +31,7 @@#include <lapi/fnmatch.h> #include <stdlib.h> #include <stdio.h> +#include <string.h> #include <dirent.h> #include <errno.h> #include <unistd.h>
@@ -287,7 +288,7 @@ static void spawn_workers(void)int i;struct worker *wa = workers; -bzero (workers, worker_count *sizeof (*workers)); +memset (workers,0 , worker_count *sizeof (*workers));for (i =0 ; i < worker_count; i++) { wa[i].q =queue_init ();
testcases/kernel/hotplug/memory_hotplug/memtoy.c +1 -1
@@ -367,7 +367,7 @@ void touch_memory(bool rw, unsigned long *memp, size_t memlen)void init_glctx (glctx_t * gcp) { -bzero (gcp,sizeof (glctx_t)); +memset (gcp,0 ,sizeof (glctx_t)); gcp->pagesize = (size_t )sysconf (_SC_PAGESIZE);
testcases/kernel/syscalls/epoll_ctl/epoll_ctl01.c +2 -2
@@ -21,7 +21,7 @@#include <sys/epoll.h> #include <poll.h> -#include <strings.h> +#include <string.h> #include <errno.h> #include "tst_test.h"
@@ -88,7 +88,7 @@ static void check_epoll_ctl(int opt, int exp_num)while (events) {int events_matched =0 ; -bzero (res_evs,sizeof (res_evs)); +memset (res_evs,0 ,sizeof (res_evs)); res =epoll_wait (epfd, res_evs,2 ,-1 );if (res <=0 ) {
testcases/kernel/syscalls/epoll_wait/epoll_wait01.c +1 -2
@@ -14,7 +14,6 @@#include <sys/epoll.h> #include <poll.h> #include <string.h> -#include <strings.h> #include <errno.h> #include "tst_test.h"
@@ -181,7 +180,7 @@ static void verify_epollio(void)while (events) {int events_matched =0 ; -bzero (ret_evs,sizeof (ret_evs)); +memset (ret_evs,0 ,sizeof (ret_evs));TEST (epoll_wait (epfd, ret_evs,2 ,-1 ));if (TST_RET <=0 ) {
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <errno.h> #include "lapi/rpc.h"
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_performance.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <sys/time.h> #include "lapi/rpc.h"
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_stress.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <errno.h> #include "lapi/rpc.h"
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/rpc_svc_2.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <rpc/rpc.h> #include <utmp.h>
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/tirpc_svc_11.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <sys/socket.h> #include <errno.h> #include <netinet/in.h>
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/tirpc_svc_3.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <sys/socket.h> #include <errno.h> #include "lapi/rpc.h"
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/tirpc_svc_4.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <sys/socket.h> #include <errno.h> #include "lapi/rpc.h"
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/tirpc_svc_5.c +1 -0
@@ -27,6 +27,7 @@*/ #include <stdio.h> +#include <string.h> #include <sys/socket.h> #include <errno.h> #include <netinet/in.h>
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/tirpc_svc_6.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <sys/socket.h> #include <errno.h> #include <pthread.h>
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/tirpc_svc_7.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <sys/socket.h> #include <errno.h> #include <netinet/in.h>
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/tirpc_svc_8.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <pthread.h> #include <sys/socket.h> #include <errno.h>
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/tirpc_svc_9.c +1 -0
@@ -26,6 +26,7 @@*/ #include <stdio.h> +#include <string.h> #include <pthread.h> #include <sys/socket.h> #include <errno.h>
utils/sctp/func_tests/test_getname.c +8 -9
@@ -41,7 +41,6 @@#include <unistd.h> #include <stdlib.h> #include <string.h> -#include <strings.h> #include <fcntl.h> #include <sys/types.h> #include <sys/socket.h>
@@ -92,7 +91,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,0 ,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);
@@ -101,7 +100,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,0 ,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);
@@ -125,7 +124,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,0 ,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);
@@ -135,7 +134,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,0 ,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);
@@ -149,7 +148,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,0 ,sizeof (svr_local_addr)); len =sizeof (svr_local_addr);/* Get the server's local address. */ error = getsockname(accept_sk, (struct sockaddr *)&svr_local_addr,
@@ -160,7 +159,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,0 ,sizeof (svr_peer_addr)); len =sizeof (svr_peer_addr);/* Get the server's peer address. */ error = getpeername(accept_sk, (struct sockaddr *)&svr_peer_addr,
@@ -200,7 +199,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,0 ,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);
@@ -235,7 +234,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,0 ,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);
Signature · 1 line
2.24.0
PATCH 2/2 rpc: Replace bcopy() with memcpy()
bcopy() is deprecated.
Signed-off-by Petr Vorel <[email protected]>
--- .../rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c | 3 ++- .../rpc_clnttcp_create_limits.c | 3 ++- .../rpc_clnttcp_create_performance.c | 3 ++- .../rpc_clnttcp_create_stress.c | 3 ++- .../rpc_clntudp_bufcreate.c | 1 + .../rpc_clntudp_bufcreate_limits.c | 1 + .../rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c | 1 + .../rpc_clntudp_create_performance.c | 1 + .../rpc_clntudp_create_stress.c | 1 + 9 files changed, 13 insertions(+), 4 deletions(-)
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c +2 -1
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <rpc/rpc.h> #include <sys/socket.h>
@@ -61,7 +62,7 @@ int main(int argn, char *argc[])exit (-1 ); } -bcopy (hp->h_addr, (caddr_t) & server_addr.sin_addr, hp->h_length); +memcpy ((caddr_t) & server_addr.sin_addr, hp->h_addr, hp->h_length); server_addr.sin_family =AF_INET ; server_addr.sin_port =0 ;
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c +2 -1
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <rpc/rpc.h> #include <sys/socket.h>
@@ -72,7 +73,7 @@ int main(int argn, char *argc[])exit (-1 ); } -bcopy (hp->h_addr, (caddr_t) & server_addr.sin_addr, hp->h_length); +memcpy ((caddr_t) & server_addr.sin_addr, hp->h_addr, hp->h_length); server_addr.sin_family =AF_INET ; server_addr.sin_port =0 ;
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_performance.c +2 -1
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <sys/time.h> #include <rpc/rpc.h> #include <netdb.h>
@@ -112,7 +113,7 @@ int main(int argn, char *argc[])exit (5 ); } -bcopy (hp->h_addr, (caddr_t) & server_addr.sin_addr, hp->h_length); +memcpy ((caddr_t) & server_addr.sin_addr, hp->h_addr, hp->h_length); server_addr.sin_family =AF_INET ; server_addr.sin_port =0 ;
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c +2 -1
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <rpc/rpc.h> #include <sys/socket.h>
@@ -65,7 +66,7 @@ int main(int argn, char *argc[])exit (-1 ); } -bcopy (hp->h_addr, (caddr_t) & server_addr.sin_addr, hp->h_length); +memcpy ((caddr_t) & server_addr.sin_addr, hp->h_addr, hp->h_length); server_addr.sin_family =AF_INET ; server_addr.sin_port =0 ;
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <rpc/rpc.h> #include <sys/socket.h>
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <rpc/rpc.h> #include <sys/socket.h>
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <rpc/rpc.h> #include <sys/socket.h>
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_performance.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <sys/time.h> #include <rpc/rpc.h> #include <netdb.h>
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c +1 -0
@@ -27,6 +27,7 @@#include <stdio.h> #include <stdlib.h> +#include <string.h> #include <time.h> #include <rpc/rpc.h> #include <sys/socket.h>
Signature · 1 line
2.24.0