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

clang-tidy: do not use else after return 

Found with readability-else-after-return

Signed-off-by: Rosen Penev <rosenp@gmail.com>
pull/250/head
Rosen Penev 2020-10-12 00:08:10 -07:00
parent 5a93509655
commit 17a5fe6022
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
10 changed files with 101 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asc2log.c
View File

@ -359,7 +359,6 @@ int get_date(struct timeval *tv, char *date) {
before parsing the real year value (hack) */
if (!strptime(date, "%B %d %I:%M:%S.%Y %p %Y", &tms))
return 1;
else
sscanf(date, "%*s %*d %*d:%*d:%*d.%3u ", &msecs);
}
@ -377,7 +376,6 @@ int get_date(struct timeval *tv, char *date) {
before parsing the real year value (hack) */
if (!strptime(date, "%B %d %H:%M:%S.%Y %Y", &tms))
return 1;
else
sscanf(date, "%*s %*d %*d:%*d:%*d.%3u ", &msecs);
}
}

16
canfdtest.c
View File

@ -181,21 +181,19 @@ static int send_frame(struct can_frame *frame)
while ((ret = send(sockfd, frame, sizeof(*frame), 0))
!= sizeof(*frame)) {
if (ret < 0) {
if (ret >= 0) {
fprintf(stderr, "send returned %d", ret);
return -1;
}
if (errno != ENOBUFS) {
perror("send failed");
return -1;
} else {
}
if (verbose) {
printf("N");
fflush(stdout);
}
}
} else {
fprintf(stderr, "send returned %d", ret);
return -1;
}
}
return 0;
}
@ -332,7 +330,8 @@ static int can_echo_gen(void)
if (recv_tx_pos == inflight_count)
recv_tx_pos = 0;
continue;
} else {
}
if (!recv_tx[recv_rx_pos]) {
printf("RX before TX!\n");
print_frame(&rx_frame, 0);
@ -343,7 +342,6 @@ static int can_echo_gen(void)
recv_rx_pos++;
if (recv_rx_pos == inflight_count)
recv_rx_pos = 0;
}
loops++;
if (test_loops && loops >= test_loops)

2
cangen.c
View File

@ -468,7 +468,7 @@ resend:
if (poll(&fds, 1, polltimeout) < 0) {
perror("poll");
return 1;
} else
}
goto resend;
} else
enobufs_count++;

1
canlogserver.c
View File

@ -300,7 +300,6 @@ int main(int argc, char **argv)
//printf("accepted\n");
if (!fork())
break;
else
close(accsocket);
}
else if (errno != EINTR) {

32
isotpdump.c
View File

@ -335,26 +335,26 @@ int main(int argc, char **argv)
if (nbytes < 0) {
perror("read");
return 1;
} else if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
}
if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
fprintf(stderr, "read: incomplete CAN frame %zu %d\n", sizeof(frame), nbytes);
return 1;
} else {
if (frame.can_id == src && ext && !extany && extaddr != frame.data[0])
}
if (frame.can_id == src && ext && !extany &&
extaddr != frame.data[0])
continue;
if (frame.can_id == dst && rx_ext && !rx_extany && rx_extaddr != frame.data[0])
if (frame.can_id == dst && rx_ext && !rx_extany &&
rx_extaddr != frame.data[0])
continue;
if (color)
printf("%s", (frame.can_id == src)? FGRED:FGBLUE);
printf("%s", (frame.can_id == src) ? FGRED : FGBLUE);
if (timestamp) {
ioctl(s, SIOCGSTAMP, &tv);
switch (timestamp) {
case 'a': /* absolute with timestamp */
printf("(%lu.%06lu) ", tv.tv_sec, tv.tv_usec);
break;
@ -365,10 +365,10 @@ int main(int argc, char **argv)
char timestring[25];
tm = *localtime(&tv.tv_sec);
strftime(timestring, 24, "%Y-%m-%d %H:%M:%S", &tm);
strftime(timestring, 24, "%Y-%m-%d %H:%M:%S",
&tm);
printf("(%s.%06lu) ", timestring, tv.tv_usec);
}
break;
} break;
case 'd': /* delta */
case 'z': /* starting with zero */
@ -383,12 +383,13 @@ int main(int argc, char **argv)
diff.tv_sec--, diff.tv_usec += 1000000;
if (diff.tv_sec < 0)
diff.tv_sec = diff.tv_usec = 0;
printf("(%lu.%06lu) ", diff.tv_sec, diff.tv_usec);
printf("(%lu.%06lu) ", diff.tv_sec,
diff.tv_usec);
if (timestamp == 'd')
last_tv = tv; /* update for delta calculation */
}
break;
last_tv =
tv; /* update for delta calculation */
} break;
default: /* no timestamp output */
break;
@ -502,7 +503,6 @@ int main(int argc, char **argv)
printf("\n");
fflush(stdout);
}
}
close(s);

7
isotpperf.c
View File

@ -223,12 +223,14 @@ int main(int argc, char **argv)
ret = nbytes;
running = 0;
continue;
} else if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
}
if (nbytes != CAN_MTU && nbytes != CANFD_MTU) {
fprintf(stderr, "read: incomplete CAN frame %zu %d\n", sizeof(frame), nbytes);
ret = nbytes;
running = 0;
continue;
} else {
}
if (rcvlen) {
/* make sure to process only the detected PDU CAN frame type */
if (canfd_on && (nbytes != CANFD_MTU))
@ -409,7 +411,6 @@ int main(int argc, char **argv)
}
fflush(stdout);
}
}
close(s);

3
j1939acd.c
View File

@ -383,9 +383,8 @@ static inline int addr_status_mine(int sa)
{
if (sa == s.current_sa)
return '*';
else if (addr[sa].flags & F_USE)
if (addr[sa].flags & F_USE)
return '+';
else
return '-';
}

11
j1939cat.c
View File

@ -212,7 +212,6 @@ static int j1939cat_extract_serr(struct j1939cat_priv *priv)
if (serr->ee_info == SCM_TSTAMP_SCHED)
return -EINTR;
else
return 0;
case SO_EE_ORIGIN_LOCAL:
/*
@ -319,11 +318,10 @@ static int j1939cat_send_loop(struct j1939cat_priv *priv, int out_fd, char *buf,
ret = poll(&fds, 1, priv->polltimeout);
if (ret == -EINTR)
continue;
else if (ret < 0)
if (ret < 0)
return -errno;
else if (!ret)
if (!ret)
return -ETIME;
if (!(fds.revents & events)) {
warn("%s: something else is wrong", __func__);
return -EIO;
@ -333,11 +331,10 @@ static int j1939cat_send_loop(struct j1939cat_priv *priv, int out_fd, char *buf,
ret = j1939cat_recv_err(priv);
if (ret == -EINTR)
continue;
else if (ret)
if (ret)
return ret;
else if ((priv->repeat - 1) == stats->tskey)
if ((priv->repeat - 1) == stats->tskey)
tx_done = true;
}
if (fds.revents & POLLOUT) {

4
libj1939.c
View File

@ -64,7 +64,7 @@ static const char *libj1939_ifnam(int ifindex)
*/
libj1939_cleanup();
return libj1939_ifnam(ifindex);
} else
}
return NULL;
}
@ -88,7 +88,7 @@ static int libj1939_ifindex(const char *str)
if (cached) {
libj1939_cleanup();
return libj1939_ifindex(str);
} else
}
return 0;
}