Skip to content

Commit 7939678

Browse files
hartkopphartkopp
committed
can-utils: unify indention
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
1 parent 88a0417 commit 7939678

14 files changed

Lines changed: 707 additions & 706 deletions

‎asc2log.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ static void eval_canxl_fd(char* buf, struct timeval *date_tvp, char timestamps,
584584
return;
585585

586586
if (!(flags & ASC_F_FDF))
587-
return;
587+
return;
588588

589589
cf.flags = CANFD_FDF;
590590

‎candump.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -715,12 +715,12 @@ int main(int argc, char **argv)
715715
localtime_r(&currtime, &now);
716716

717717
snprintf(fname, sizeof(fname), "candump-%04d-%02d-%02d_%02d%02d%02d.log",
718-
now.tm_year + 1900,
719-
now.tm_mon + 1,
720-
now.tm_mday,
721-
now.tm_hour,
722-
now.tm_min,
723-
now.tm_sec);
718+
now.tm_year + 1900,
719+
now.tm_mon + 1,
720+
now.tm_mday,
721+
now.tm_hour,
722+
now.tm_min,
723+
now.tm_sec);
724724

725725
logname = fname;
726726
}
@@ -891,8 +891,8 @@ int main(int argc, char **argv)
891891
alen = sprintf(afrbuf, " %s", (color > 2) ? col_on[idx % MAXCOL] : "");
892892
alen += sprint_timestamp(afrbuf + alen, timestamp, use_ns, &ts, &last_ts);
893893
alen += sprintf(afrbuf + alen, " %s%*s",
894-
(color && (color < 3)) ? col_on[idx % MAXCOL] : "",
895-
max_devname_len, devname[idx]);
894+
(color && (color < 3)) ? col_on[idx % MAXCOL] : "",
895+
max_devname_len, devname[idx]);
896896

897897
if (extra_msg_info) {
898898
if (msg.msg_flags & MSG_DONTROUTE)

‎canlogserver.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ int main(int argc, char **argv)
317317
for (i=0; i<currmax; i++) {
318318

319319
pr_debug("open %d '%s' m%08X v%08X i%d e%d.\n",
320-
i, argv[optind+i], mask[i], value[i],
321-
inv_filter[i], err_mask[i]);
320+
i, argv[optind+i], mask[i], value[i],
321+
inv_filter[i], err_mask[i]);
322322

323323
if ((s[i] = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0) {
324324
perror("socket");

‎cansniffer.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,15 @@ void switchvdl(char *delim)
161161

162162
int comp(const void *elem1, const void *elem2)
163163
{
164-
unsigned long f = ((struct snif*)elem1)->current.can_id;
165-
unsigned long s = ((struct snif*)elem2)->current.can_id;
164+
unsigned long f = ((struct snif*)elem1)->current.can_id;
165+
unsigned long s = ((struct snif*)elem2)->current.can_id;
166166

167-
if (f > s)
168-
return 1;
169-
if (f < s)
170-
return -1;
167+
if (f > s)
168+
return 1;
169+
if (f < s)
170+
return -1;
171171

172-
return 0;
172+
return 0;
173173
}
174174

175175
void print_usage(char *prg)
@@ -741,10 +741,10 @@ int handle_timeo(long currcms)
741741
do_clr(i, UPDATE);
742742
}
743743
else if ((sniftab[i].hold) && (sniftab[i].hold < currcms)) {
744-
memset(&sniftab[i].marker.data, 0, max_dlen);
745-
print_snifline(i);
746-
sniftab[i].hold = 0; /* disable update by hold */
747-
}
744+
memset(&sniftab[i].marker.data, 0, max_dlen);
745+
print_snifline(i);
746+
sniftab[i].hold = 0; /* disable update by hold */
747+
}
748748
else
749749
printf("%s", CSR_DOWN); /* skip my line */
750750

‎isotpdump.c‎

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -426,112 +426,112 @@ int main(int argc, char **argv)
426426
}
427427
}
428428

429-
if (frame.can_id & CAN_EFF_FLAG)
430-
printf(" %s %8X", argv[optind], frame.can_id & CAN_EFF_MASK);
431-
else
432-
printf(" %s %3X", argv[optind], frame.can_id & CAN_SFF_MASK);
433-
434-
if (ext)
435-
printf("{%02X}", frame.data[0]);
429+
if (frame.can_id & CAN_EFF_FLAG)
430+
printf(" %s %8X", argv[optind], frame.can_id & CAN_EFF_MASK);
431+
else
432+
printf(" %s %3X", argv[optind], frame.can_id & CAN_SFF_MASK);
433+
434+
if (ext)
435+
printf("{%02X}", frame.data[0]);
436+
437+
if (nbytes == CAN_MTU)
438+
printf(" [%d] ", frame.len);
439+
else
440+
printf(" [%02d] ", frame.len);
441+
442+
datidx = 0;
443+
n_pci = frame.data[ext];
444+
445+
switch (n_pci & 0xF0) {
446+
case 0x00:
447+
is_ff = 1;
448+
if (n_pci & 0xF) {
449+
printf("[SF] ln: %-4d data:", n_pci & 0xF);
450+
datidx = ext+1;
451+
} else {
452+
printf("[SF] ln: %-4d data:", frame.data[ext + 1]);
453+
datidx = ext+2;
454+
}
455+
break;
436456

437-
if (nbytes == CAN_MTU)
438-
printf(" [%d] ", frame.len);
439-
else
440-
printf(" [%02d] ", frame.len);
441-
442-
datidx = 0;
443-
n_pci = frame.data[ext];
444-
445-
switch (n_pci & 0xF0) {
446-
case 0x00:
447-
is_ff = 1;
448-
if (n_pci & 0xF) {
449-
printf("[SF] ln: %-4d data:", n_pci & 0xF);
450-
datidx = ext+1;
451-
} else {
452-
printf("[SF] ln: %-4d data:", frame.data[ext + 1]);
453-
datidx = ext+2;
454-
}
455-
break;
457+
case 0x10:
458+
is_ff = 1;
459+
fflen = ((n_pci & 0x0F)<<8) + frame.data[ext+1];
460+
if (fflen)
461+
datidx = ext+2;
462+
else {
463+
fflen = (frame.data[ext+2]<<24) +
464+
(frame.data[ext+3]<<16) +
465+
(frame.data[ext+4]<<8) +
466+
frame.data[ext+5];
467+
datidx = ext+6;
468+
}
469+
printf("[FF] ln: %-4lu data:", fflen);
470+
break;
456471

457-
case 0x10:
458-
is_ff = 1;
459-
fflen = ((n_pci & 0x0F)<<8) + frame.data[ext+1];
460-
if (fflen)
461-
datidx = ext+2;
462-
else {
463-
fflen = (frame.data[ext+2]<<24) +
464-
(frame.data[ext+3]<<16) +
465-
(frame.data[ext+4]<<8) +
466-
frame.data[ext+5];
467-
datidx = ext+6;
468-
}
469-
printf("[FF] ln: %-4lu data:", fflen);
470-
break;
472+
case 0x20:
473+
printf("[CF] sn: %X data:", n_pci & 0x0F);
474+
datidx = ext+1;
475+
break;
471476

472-
case 0x20:
473-
printf("[CF] sn: %X data:", n_pci & 0x0F);
474-
datidx = ext+1;
475-
break;
477+
case 0x30:
478+
n_pci &= 0x0F;
479+
printf("[FC] FC: %d ", n_pci);
476480

477-
case 0x30:
478-
n_pci &= 0x0F;
479-
printf("[FC] FC: %d ", n_pci);
481+
if (n_pci > 3)
482+
n_pci = 3;
480483

481-
if (n_pci > 3)
482-
n_pci = 3;
484+
printf("= %s # ", fc_info[n_pci]);
483485

484-
printf("= %s # ", fc_info[n_pci]);
486+
printf("BS: %d %s# ", frame.data[ext+1],
487+
(frame.data[ext+1])? "":"= off ");
485488

486-
printf("BS: %d %s# ", frame.data[ext+1],
487-
(frame.data[ext+1])? "":"= off ");
489+
i = frame.data[ext+2];
490+
printf("STmin: 0x%02X = ", i);
488491

489-
i = frame.data[ext+2];
490-
printf("STmin: 0x%02X = ", i);
492+
if (i < 0x80)
493+
printf("%d ms", i);
494+
else if (i > 0xF0 && i < 0xFA)
495+
printf("%d us", (i & 0x0F) * 100);
496+
else
497+
printf("reserved");
498+
break;
491499

492-
if (i < 0x80)
493-
printf("%d ms", i);
494-
else if (i > 0xF0 && i < 0xFA)
495-
printf("%d us", (i & 0x0F) * 100);
496-
else
497-
printf("reserved");
498-
break;
500+
default:
501+
printf("[??]");
502+
}
499503

500-
default:
501-
printf("[??]");
504+
if (datidx && frame.len > datidx) {
505+
printf(" ");
506+
for (i = datidx; i < frame.len; i++) {
507+
printf("%02X ", frame.data[i]);
502508
}
503509

504-
if (datidx && frame.len > datidx) {
505-
printf(" ");
510+
if (asc) {
511+
printf("%*s", ((7-ext) - (frame.len-datidx))*3 + 5 ,
512+
"- '");
506513
for (i = datidx; i < frame.len; i++) {
507-
printf("%02X ", frame.data[i]);
508-
}
509-
510-
if (asc) {
511-
printf("%*s", ((7-ext) - (frame.len-datidx))*3 + 5 ,
512-
"- '");
513-
for (i = datidx; i < frame.len; i++) {
514-
printf("%c",((frame.data[i] > 0x1F) &&
515-
(frame.data[i] < 0x7F))?
516-
frame.data[i] : '.');
517-
}
518-
printf("'");
519-
}
520-
if (uds_output && is_ff) {
521-
int offset = 3;
522-
if (asc)
523-
offset = 1;
524-
printf("%*s", ((7-ext) - (frame.len-datidx))*offset + 3,
525-
" - ");
526-
print_uds_message(frame.data[datidx], frame.data[datidx+2]);
527-
is_ff = 0;
514+
printf("%c",((frame.data[i] > 0x1F) &&
515+
(frame.data[i] < 0x7F))?
516+
frame.data[i] : '.');
528517
}
518+
printf("'");
519+
}
520+
if (uds_output && is_ff) {
521+
int offset = 3;
522+
if (asc)
523+
offset = 1;
524+
printf("%*s", ((7-ext) - (frame.len-datidx))*offset + 3,
525+
" - ");
526+
print_uds_message(frame.data[datidx], frame.data[datidx+2]);
527+
is_ff = 0;
529528
}
529+
}
530530

531-
if (color)
532-
printf("%s", ATTRESET);
533-
printf("\n");
534-
fflush(stdout);
531+
if (color)
532+
printf("%s", ATTRESET);
533+
printf("\n");
534+
fflush(stdout);
535535
}
536536

537537
close(s);

0 commit comments

Comments
 (0)