mirror of
https://github.com/linux-can/can-utils.git
synced 2026-08-06 06:49:53 +02:00
Merge pull request #438 from marckleinebudde/candump-cleanup
candump: main(): use C99 initializers for struct sockaddr_can addr
This commit is contained in:
@@ -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);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user