staging: usbip: userspace: use memset instead of bzero

bzero is and has been deprecated since POSIX.1-2001.

Signed-off-by: matt mooney <mfm@muteddisk.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/usbip/userspace/configure.ac b/drivers/staging/usbip/userspace/configure.ac
index e7d801be6b7cd1d3c423cd8796f7aad61534297b..06fb95d083cf61d02361ff34e47cbe5bf2269ba4 100644 (file)
--- a/drivers/staging/usbip/userspace/configure.ac
+++ b/drivers/staging/usbip/userspace/configure.ac
@@ -29,7 +29,7 @@ AC_PROG_MAKE_SET
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h dnl
-                 string.h strings.h sys/socket.h syslog.h unistd.h])
+                 string.h sys/socket.h syslog.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_INT32_T
@@ -41,7 +41,7 @@ AC_TYPE_UINT8_T
 
 # Checks for library functions.
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([bzero memset mkdir regcomp socket strchr strerror strstr dnl
+AC_CHECK_FUNCS([memset mkdir regcomp socket strchr strerror strstr dnl
                strtoul])
 
 AC_CHECK_HEADER([sysfs/libsysfs.h],

diff --git a/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
index 2c58af51a230387e5374b5576218a8350309b63f..b38396f618d116f0c83d8f88aec43b3f0c068125 100644 (file)
--- a/drivers/staging/usbip/userspace/libsrc/usbip_common.h
+++ b/drivers/staging/usbip/userspace/libsrc/usbip_common.h
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <strings.h>
 
 #include <sysfs/libsysfs.h>
 #include <netdb.h>

diff --git a/drivers/staging/usbip/userspace/libsrc/vhci_driver.c b/drivers/staging/usbip/userspace/libsrc/vhci_driver.c
index f2030b1da6e181467c6fddbf9deabcc18f66be39..386f63b456f5af125b7dad0a35ffc5457bdd77d4 100644 (file)
--- a/drivers/staging/usbip/userspace/libsrc/vhci_driver.c
+++ b/drivers/staging/usbip/userspace/libsrc/vhci_driver.c
@@ -52,7 +52,7 @@ static int parse_status(char *value)
 
 
        for (int i = 0; i < vhci_driver->nports; i++)
-               bzero(&vhci_driver->idev[i], sizeof(struct usbip_imported_device));
+               memset(&vhci_driver->idev[i], 0, sizeof(vhci_driver->idev[i]));
 
 
        /* skip a header line */

diff --git a/drivers/staging/usbip/userspace/src/usbip_network.c b/drivers/staging/usbip/userspace/src/usbip_network.c
index ef93b02833eaa8653f62763416f9cba5e87496a0..0e0de562062b0d7f947f2a1736c97c0fd2a8f9f7 100644 (file)
--- a/drivers/staging/usbip/userspace/src/usbip_network.c
+++ b/drivers/staging/usbip/userspace/src/usbip_network.c
@@ -100,7 +100,7 @@ int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status)
        int ret;
        struct op_common op_common;
 
-       bzero(&op_common, sizeof(op_common));
+       memset(&op_common, 0, sizeof(op_common));
 
        op_common.version       = USBIP_VERSION;
        op_common.code          = code;
@@ -122,7 +122,7 @@ int usbip_recv_op_common(int sockfd, uint16_t *code)
        int ret;
        struct op_common op_common;
 
-       bzero(&op_common, sizeof(op_common));
+       memset(&op_common, 0, sizeof(op_common));
 
        ret = usbip_recv(sockfd, (void *) &op_common, sizeof(op_common));
        if (ret < 0) {

diff --git a/drivers/staging/usbip/userspace/src/usbipd.c b/drivers/staging/usbip/userspace/src/usbipd.c
index ccc7dfdd02427b68b74a81e82b61f3024ff50bad..12ff00b2698ebca87db2ed22509d032c431ff3d9 100644 (file)
--- a/drivers/staging/usbip/userspace/src/usbipd.c
+++ b/drivers/staging/usbip/userspace/src/usbipd.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <netdb.h>
-#include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -100,7 +100,7 @@ static int recv_request_devlist(int sockfd)
        int ret;
        struct op_devlist_request req;
 
-       bzero(&req, sizeof(req));
+       memset(&req, 0, sizeof(req));
 
        ret = usbip_recv(sockfd, (void *) &req, sizeof(req));
        if (ret < 0) {
@@ -127,8 +127,8 @@ static int recv_request_import(int sockfd)
        int found = 0;
        int error = 0;
 
-       bzero(&req, sizeof(req));
-       bzero(&reply, sizeof(reply));
+       memset(&req, 0, sizeof(req));
+       memset(&reply, 0, sizeof(reply));
 
        ret = usbip_recv(sockfd, (void *) &req, sizeof(req));
        if (ret < 0) {
@@ -244,7 +244,7 @@ static struct addrinfo *my_getaddrinfo(char *host, int ai_family)
        int ret;
        struct addrinfo hints, *ai_head;
 
-       bzero(&hints, sizeof(hints));
+       memset(&hints, 0, sizeof(hints));
 
        hints.ai_family   = ai_family;
        hints.ai_socktype = SOCK_STREAM;
@@ -337,7 +337,7 @@ static int my_accept(int lsock)
        char host[NI_MAXHOST], port[NI_MAXSERV];
        int ret;
 
-       bzero(&ss, sizeof(ss));
+       memset(&ss, 0, sizeof(ss));
 
        csock = accept(lsock, (struct sockaddr *) &ss, &len);
        if (csock < 0) {
@@ -380,7 +380,7 @@ static void set_signal(void)
 {
        struct sigaction act;
 
-       bzero(&act, sizeof(act));
+       memset(&act, 0, sizeof(act));
        act.sa_handler = signal_handler;
        sigemptyset(&act.sa_mask);
        sigaction(SIGTERM, &act, NULL);

diff --git a/drivers/staging/usbip/userspace/src/utils.c b/drivers/staging/usbip/userspace/src/utils.c
index 6f91557579e5b29ab44a66f80deea5fa3b090ad4..35b05e4506faddea4ad9d783f01cb40cfc6cdd9c 100644 (file)
--- a/drivers/staging/usbip/userspace/src/utils.c
+++ b/drivers/staging/usbip/userspace/src/utils.c
@@ -64,7 +64,7 @@ int read_integer(char *path)
        int fd;
        int ret = 0;
 
-       bzero(buff, sizeof(buff));
+       memset(buff, 0, sizeof(buff));
 
        fd = open(path, O_RDONLY);
        if (fd < 0)