Skip to content

Commit

Permalink
staging: usbip: userspace: use memset instead of bzero
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
matt mooney authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent a6d8181 commit 950a4cd
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/usbip/userspace/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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],
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/usbip/userspace/libsrc/usbip_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <strings.h>

#include <sysfs/libsysfs.h>
#include <netdb.h>
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/usbip/userspace/libsrc/vhci_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/usbip/userspace/src/usbip_network.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/usbip/userspace/src/usbipd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/usbip/userspace/src/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 950a4cd

Please sign in to comment.