sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #438 from marckleinebudde/candump-cleanup 

candump: main(): use C99 initializers for struct sockaddr_can addr
pull/439/head
Marc Kleine-Budde 2023-07-04 09:41:18 +02:00 committed by GitHub
parent 58083ad34a 6c7542a3ff
commit ba5d7de30d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
candump.c
View File

@ -299,7 +299,9 @@ int main(int argc, char **argv)
int currmax, numfilter; int currmax, numfilter;
int join_filter; int join_filter;
char *ptr, *nptr; char *ptr, *nptr;
struct sockaddr_can addr; struct sockaddr_can addr = {
.can_family = AF_CAN,
};
char ctrlmsg[CMSG_SPACE(sizeof(struct timeval)) + char ctrlmsg[CMSG_SPACE(sizeof(struct timeval)) +
CMSG_SPACE(3 * sizeof(struct timespec)) + CMSG_SPACE(3 * sizeof(struct timespec)) +
CMSG_SPACE(sizeof(__u32))]; CMSG_SPACE(sizeof(__u32))];
@ -505,8 +507,6 @@ int main(int argc, char **argv)
if (nbytes > max_devname_len) if (nbytes > max_devname_len)
max_devname_len = nbytes; /* for nice printing */ max_devname_len = nbytes; /* for nice printing */
addr.can_family = AF_CAN;
memset(&ifr.ifr_name, 0, sizeof(ifr.ifr_name)); memset(&ifr.ifr_name, 0, sizeof(ifr.ifr_name));
strncpy(ifr.ifr_name, ptr, nbytes); strncpy(ifr.ifr_name, ptr, nbytes);