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 3fe9ac9cb2 into c3305fdd51

pull/35/merge
Jiho Chu 2016-12-20 14:07:38 +00:00 committed by GitHub
parent c3305fdd51 3fe9ac9cb2
commit a645a2d39f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bcmserver.c
View File

@ -150,12 +150,18 @@ int main(int argc, char **argv)
char buf[MAXLEN]; char buf[MAXLEN];
char rxmsg[50]; char rxmsg[50];
char format[MAXLEN];
struct { struct {
struct bcm_msg_head msg_head; struct bcm_msg_head msg_head;
struct can_frame frame; struct can_frame frame;
} msg; } msg;
if (snprintf(format, MAXLEN, "< %%%ds %%c %%lu %%lu %%x %%hhu "
"%%hhx %%hhx %%hhx %%hhx %%hhx %%hhx "
"%%hhx %%hhx >", IFNAMSIZ-1) >= MAXLEN)
exit(1);
sigemptyset(&sigset); sigemptyset(&sigset);
signalaction.sa_handler = &childdied; signalaction.sa_handler = &childdied;
signalaction.sa_mask = sigset; signalaction.sa_mask = sigset;
@ -282,9 +288,7 @@ int main(int argc, char **argv)
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.msg_head.nframes = 1; msg.msg_head.nframes = 1;
items = sscanf(buf, "< %6s %c %lu %lu %x %hhu " items = sscanf(buf, format,
"%hhx %hhx %hhx %hhx %hhx %hhx "
"%hhx %hhx >",
ifr.ifr_name, ifr.ifr_name,
&cmd, &cmd,
&msg.msg_head.ival2.tv_sec, &msg.msg_head.ival2.tv_sec,