Merge pull request #482 from marckleinebudde/codingstyle

Codingstyle

candump.c

@@ -106,7 +106,7 @@ struct if_info { /* bundled information per open socket */
 static struct if_info sock_info[MAXSOCK];
 
 static char *progname;
-static char devname[MAXIFNAMES][IFNAMSIZ+1];
+static char devname[MAXIFNAMES][IFNAMSIZ + 1];
 static int dindex[MAXIFNAMES];
 static int max_devname_len; /* to prevent frazzled device name output */
 static const int canfd_on = 1;
@@ -175,7 +175,6 @@ static void sigterm(int signo)
 
 static int idx2dindex(int ifidx, int socket)
 {
-
 	int i;
 	struct ifreq ifr;
 
@@ -474,8 +473,8 @@ int main(int argc, char **argv)
 	}
 
 	for (i = 0; i < currmax; i++) {
-		struct if_info* obj = &sock_info[i];
+		struct if_info *obj = &sock_info[i];
-		ptr = argv[optind+i];
+		ptr = argv[optind + i];
 		nptr = strchr(ptr, ',');
 
 		pr_debug("open %d '%s'.\n", i, ptr);
@@ -715,7 +714,7 @@ int main(int argc, char **argv)
 		}
 
 		for (i = 0; i < num_events; i++) { /* check waiting CAN RAW sockets */
-			struct if_info* obj = events_pending[i].data.ptr;
+			struct if_info *obj = events_pending[i].data.ptr;
 			int idx;
 			char *extra_info = "";
 
@@ -838,9 +837,9 @@ int main(int argc, char **argv)
 
 			if (extra_msg_info) {
 				if (msg.msg_flags & MSG_DONTROUTE)
-					printf ("  TX %s", extra_m_info[frame.flags & 3]);
+					printf("  TX %s", extra_m_info[frame.flags & 3]);
 				else
-					printf ("  RX %s", extra_m_info[frame.flags & 3]);
+					printf("  RX %s", extra_m_info[frame.flags & 3]);
 			}
 
 			printf("%s  ", (color == 1) ? col_off : "");
@@ -850,7 +849,7 @@ int main(int argc, char **argv)
 			printf("%s", (color > 1) ? col_off : "");
 			printf("\n");
 
- out_fflush:
+out_fflush:
 			fflush(stdout);
 		}
 	}

canfdtest.c

@@ -110,13 +110,8 @@ static void print_frame(canid_t id, const uint8_t *data, int dlc, int inc_data)
 	printf("\n");
 }
 
-static void print_compare(
+static void print_compare(canid_t exp_id, const uint8_t *exp_data, uint8_t exp_dlc,
-	canid_t exp_id,
+			  canid_t rec_id, const uint8_t *rec_data, uint8_t rec_dlc,
-	const uint8_t *exp_data,
-	uint8_t exp_dlc,
-	canid_t rec_id,
-	const uint8_t *rec_data,
-	uint8_t rec_dlc,
 			  int inc)
 {
 	printf("expected: ");
@@ -255,7 +250,7 @@ static int check_frame(const struct canfd_frame *frame)
 	}
 
 	for (i = 1; i < frame->len; i++) {
-		if (frame->data[i] != (uint8_t)(frame->data[i-1] + 1)) {
+		if (frame->data[i] != (uint8_t)(frame->data[i - 1] + 1)) {
 			printf("Frame inconsistent!\n");
 			print_frame(frame->can_id, frame->data, frame->len, 0);
 			err = -1;
@@ -263,7 +258,7 @@ static int check_frame(const struct canfd_frame *frame)
 		}
 	}
 
- out:
+out:
 	return err;
 }
 
@@ -324,11 +319,11 @@ static int can_echo_gen(void)
 	int err = 0;
 	int i;
 
-	tx_frames = calloc(inflight_count, sizeof(* tx_frames));
+	tx_frames = calloc(inflight_count, sizeof(*tx_frames));
 	if (!tx_frames)
 		return -1;
 
-	recv_tx = calloc(inflight_count, sizeof(* recv_tx));
+	recv_tx = calloc(inflight_count, sizeof(*recv_tx));
 	if (!recv_tx) {
 		err = -1;
 		goto out_free_tx_frames;
@@ -400,9 +395,9 @@ static int can_echo_gen(void)
 
 	printf("\nTest messages sent and received: %d\n", loops);
 
- out_free:
+out_free:
 	free(recv_tx);
- out_free_tx_frames:
+out_free_tx_frames:
 	free(tx_frames);
 
 	return err;

cangen.c

@@ -324,7 +324,7 @@ static int do_send_one(int fd, void *buf, size_t len, int timeout)
 		memcpy(CMSG_DATA(cm), &tdeliver, sizeof(tdeliver));
 	}
 
- resend:
+resend:
 	nbytes = sendmsg(fd, &msg, 0);
 	if (nbytes < 0) {
 		ret = -errno;
@@ -460,7 +460,7 @@ int main(int argc, char **argv)
 	int incdlc = 0;
 	unsigned long rnd;
 	unsigned char fixdata[CANFD_MAX_DLEN];
-	unsigned char rand_position[CANFD_MAX_DLEN] = {0};
+	unsigned char rand_position[CANFD_MAX_DLEN] = { 0 };
 
 	int opt;
 	int s; /* socket */
@@ -490,7 +490,6 @@ int main(int argc, char **argv)
 
 	while ((opt = getopt_long(argc, argv, "g:atefbER8mI:L:D:p:n:ixc:vh?", long_options, NULL)) != -1) {
 		switch (opt) {
-
 		case 'g':
 			gap = strtod(optarg, NULL);
 			break;

cansend.c

@@ -81,8 +81,6 @@ void print_usage(char *prg)
 		 "  1F334455#1122334455667788_B / 123#R / 00000123#R3 / 333#R8_E\n\n");
 }
 
-
-
 int main(int argc, char **argv)
 {
 	int s; /* can raw socket */
@@ -101,7 +99,7 @@ int main(int argc, char **argv)
 
 	/* parse CAN frame */
 	required_mtu = parse_canframe(argv[2], &frame);
-	if (!required_mtu){
+	if (!required_mtu) {
 		fprintf(stderr, "\nWrong CAN-frame format!\n\n");
 		print_usage(argv[0]);
 		return 1;
@@ -126,7 +124,6 @@ int main(int argc, char **argv)
 	addr.can_ifindex = ifr.ifr_ifindex;
 
 	if (required_mtu > (int)CAN_MTU) {
-
 		/* check if the frame fits into the CAN netdevice */
 		if (ioctl(s, SIOCGIFMTU, &ifr) < 0) {
 			perror("SIOCGIFMTU");