Merge pull request #251 from neheb/clng

custom if statement reordering

asc2log.c

@@ -480,17 +480,20 @@ int main(int argc, char **argv)
 			}
 
 			/* check for decimal places length in valid CAN frames */
-			if (sscanf(buf, "%lu.%s %s ", &tmp_tv.tv_sec, tmp2, tmp1) == 3){
+			if (sscanf(buf, "%lu.%s %s ", &tmp_tv.tv_sec, tmp2,
-				dplace = strlen(tmp2);
+				   tmp1) != 3)
-				if (verbose)
-					printf("decimal place %d, e.g. '%s'\n", dplace, tmp2);
-				if (dplace < 4 || dplace > 6) {
-					printf("invalid dplace %d (must be 4, 5 or 6)!\n", dplace);
-					return 1;
-				}
-			} else
 				continue; /* dplace remains zero until first found CAN frame */
-		} 
+
+			dplace = strlen(tmp2);
+			if (verbose)
+				printf("decimal place %d, e.g. '%s'\n", dplace,
+				       tmp2);
+			if (dplace < 4 || dplace > 6) {
+				printf("invalid dplace %d (must be 4, 5 or 6)!\n",
+				       dplace);
+				return 1;
+			}
+		}
 
 		/* the representation of a valid CAN frame is known here */
 		/* so try to get CAN frames and ErrorFrames and convert them */

bcmserver.c

@@ -197,11 +197,9 @@ int main(void)
 	while (1) { 
 		sa = accept(sl,(struct sockaddr *)&clientaddr, &sin_size);
 		if (sa > 0 ){
-
+			if (!fork())
-			if (fork())
-				close(sa);
-			else
 				break;
+			close(sa);
 		}
 		else {
 			if (errno != EINTR) {

isotpperf.c

@@ -251,11 +251,11 @@ int main(int argc, char **argv)
 
 				n_pci = frame.data[rx_ext];
 				/* check flow control PCI only */
-				if ((n_pci & 0xF0) == 0x30) {
+				if ((n_pci & 0xF0) != 0x30)
-					bs = frame.data[rx_ext+1];
-					stmin = frame.data[rx_ext+2];
-				} else
 					continue;
+
+				bs = frame.data[rx_ext + 1];
+				stmin = frame.data[rx_ext + 2];
 			}
 
 			/* data content starts and index datidx */

isotpserver.c

@@ -317,11 +317,9 @@ int main(int argc, char **argv)
 	while (1) { 
 		sa = accept(sl,(struct sockaddr *)&clientaddr, &sin_size);
 		if (sa > 0 ){
-
+			if (!fork())
-			if (fork())
-				close(sa);
-			else
 				break;
+			close(sa);
 		}
 		else {
 			if (errno != EINTR) {