openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
matt mooney 2011-05-27 01:44:10 -07:00 committed by Greg Kroah-Hartman
parent a6d81814a5
commit 950a4cd8fc
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/usbip/userspace/configure.ac
View File

@ -29,7 +29,7 @@ AC_PROG_MAKE_SET
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h dnl 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. # Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_INT32_T AC_TYPE_INT32_T
@ -41,7 +41,7 @@ AC_TYPE_UINT8_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_REALLOC 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]) strtoul])
AC_CHECK_HEADER([sysfs/libsysfs.h], AC_CHECK_HEADER([sysfs/libsysfs.h],

1
drivers/staging/usbip/userspace/libsrc/usbip_common.h
View File

@ -12,7 +12,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <strings.h>
#include <sysfs/libsysfs.h> #include <sysfs/libsysfs.h>
#include <netdb.h> #include <netdb.h>

2
drivers/staging/usbip/userspace/libsrc/vhci_driver.c
View File

@ -52,7 +52,7 @@ static int parse_status(char *value)
for (int i = 0; i < vhci_driver->nports; i++) 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 */ /* skip a header line */

4
drivers/staging/usbip/userspace/src/usbip_network.c
View File

@ -100,7 +100,7 @@ int usbip_send_op_common(int sockfd, uint32_t code, uint32_t status)
int ret; int ret;
struct op_common op_common; 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.version = USBIP_VERSION;
op_common.code = code; op_common.code = code;
@ -122,7 +122,7 @@ int usbip_recv_op_common(int sockfd, uint16_t *code)
int ret; int ret;
struct op_common op_common; 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)); ret = usbip_recv(sockfd, (void *) &op_common, sizeof(op_common));
if (ret < 0) { if (ret < 0) {

14
drivers/staging/usbip/userspace/src/usbipd.c
View File

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

2
drivers/staging/usbip/userspace/src/utils.c
View File

@ -64,7 +64,7 @@ int read_integer(char *path)
int fd; int fd;
int ret = 0; int ret = 0;
bzero(buff, sizeof(buff)); memset(buff, 0, sizeof(buff));
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
if (fd < 0) if (fd < 0)