From 98ea7d7fe746089e42c8b0f11be9ad2f69972f73 Mon Sep 17 00:00:00 2001 From: matt mooney Date: Fri, 27 May 2011 01:44:10 -0700 Subject: [PATCH] --- yaml --- r: 259503 b: refs/heads/master c: 950a4cd8fcc61ffc7bb8cd5890e80e7459e22597 h: refs/heads/master i: 259501: e306a424f2f173c4f6c4ba88b0a2e8196f70f559 259499: 75743544ad44b0db499ba44c5ea887d8691a76a8 259495: 7c7431c0125eca1d7f43010b14a6ee249ec027d4 259487: 5ddf80983f49d650f2cab6af409a58ac6687431a v: v3 --- [refs] | 2 +- trunk/drivers/staging/usbip/userspace/configure.ac | 4 ++-- .../staging/usbip/userspace/libsrc/usbip_common.h | 1 - .../staging/usbip/userspace/libsrc/vhci_driver.c | 2 +- .../staging/usbip/userspace/src/usbip_network.c | 4 ++-- trunk/drivers/staging/usbip/userspace/src/usbipd.c | 14 +++++++------- trunk/drivers/staging/usbip/userspace/src/utils.c | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index cea9633298d6..a32e278401a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6d81814a5fe83c43539c0df8ed2d701911496c2 +refs/heads/master: 950a4cd8fcc61ffc7bb8cd5890e80e7459e22597 diff --git a/trunk/drivers/staging/usbip/userspace/configure.ac b/trunk/drivers/staging/usbip/userspace/configure.ac index e7d801be6b7c..06fb95d083cf 100644 --- a/trunk/drivers/staging/usbip/userspace/configure.ac +++ b/trunk/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/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h index 2c58af51a230..b38396f618d1 100644 --- a/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h +++ b/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h @@ -12,7 +12,6 @@ #include #include #include -#include #include #include diff --git a/trunk/drivers/staging/usbip/userspace/libsrc/vhci_driver.c b/trunk/drivers/staging/usbip/userspace/libsrc/vhci_driver.c index f2030b1da6e1..386f63b456f5 100644 --- a/trunk/drivers/staging/usbip/userspace/libsrc/vhci_driver.c +++ b/trunk/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/trunk/drivers/staging/usbip/userspace/src/usbip_network.c b/trunk/drivers/staging/usbip/userspace/src/usbip_network.c index ef93b02833ea..0e0de562062b 100644 --- a/trunk/drivers/staging/usbip/userspace/src/usbip_network.c +++ b/trunk/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/trunk/drivers/staging/usbip/userspace/src/usbipd.c b/trunk/drivers/staging/usbip/userspace/src/usbipd.c index ccc7dfdd0242..12ff00b2698e 100644 --- a/trunk/drivers/staging/usbip/userspace/src/usbipd.c +++ b/trunk/drivers/staging/usbip/userspace/src/usbipd.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -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/trunk/drivers/staging/usbip/userspace/src/utils.c b/trunk/drivers/staging/usbip/userspace/src/utils.c index 6f91557579e5..35b05e4506fa 100644 --- a/trunk/drivers/staging/usbip/userspace/src/utils.c +++ b/trunk/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)