Merge 76b5891765 into e2172546aa

candump.c

@@ -128,7 +128,6 @@ static void print_usage(void)
 	fprintf(stderr, "Options:\n");
 	fprintf(stderr, "         -t <type>   (timestamp: (a)bsolute/(d)elta/(z)ero/(A)bsolute w date)\n");
 	fprintf(stderr, "         -H          (read hardware timestamps instead of system timestamps)\n");
-	fprintf(stderr, "         -N          (log nanosecond timestamps instead of microseconds)\n");
 	fprintf(stderr, "         -c          (increment color mode level)\n");
 	fprintf(stderr, "         -i          (binary output - may exceed 80 chars/line)\n");
 	fprintf(stderr, "         -a          (enable additional ASCII output)\n");
@@ -221,22 +220,16 @@ static int idx2dindex(int ifidx, int socket)
 	return i;
 }
 
-static int sprint_timestamp(char *ts_buffer, const char timestamp, unsigned char use_ns,
+static int sprint_timestamp(char *ts_buffer, const char timestamp,
 			    const struct timespec *ts, struct timespec *const last_ts)
 {
 	int numchars = 0;
 
 	switch (timestamp) {
 	case 'a': /* absolute with timestamp */
-		if (use_ns) {
-			numchars = sprintf(ts_buffer, "(%010llu.%09llu) ",
-					   (unsigned long long)ts->tv_sec,
-					   (unsigned long long)ts->tv_nsec);
-		} else {
-			numchars = sprintf(ts_buffer, "(%010llu.%06llu) ",
-					   (unsigned long long)ts->tv_sec,
-					   (unsigned long long)ts->tv_nsec / 1000);
-		}
+		numchars = sprintf(ts_buffer, "(%010llu.%09llu) ",
+				   (unsigned long long)ts->tv_sec,
+				   (unsigned long long)ts->tv_nsec);
 		break;
 
 	case 'A': /* absolute with date */
@@ -246,13 +239,8 @@ static int sprint_timestamp(char *ts_buffer, const char timestamp, unsigned char
 
 		tm = *localtime(&ts->tv_sec);
 		strftime(timestring, 24, "%Y-%m-%d %H:%M:%S", &tm);
-		if (use_ns) {
-			numchars = sprintf(ts_buffer, "(%s.%09llu) ", timestring,
-					   (unsigned long long)ts->tv_nsec);
-		} else {
-			numchars = sprintf(ts_buffer, "(%s.%06llu) ", timestring,
-					   (unsigned long long)ts->tv_nsec / 1000);
-		}
+		numchars = sprintf(ts_buffer, "(%s.%09llu) ", timestring,
+				   (unsigned long long)ts->tv_nsec);
 	}
 	break;
 
@@ -269,15 +257,9 @@ static int sprint_timestamp(char *ts_buffer, const char timestamp, unsigned char
 			diff.tv_sec--, diff.tv_nsec += 1000000000;
 		if (diff.tv_sec < 0)
 			diff.tv_sec = diff.tv_nsec = 0;
-		if (use_ns) {
-			numchars = sprintf(ts_buffer, "(%03llu.%09llu) ",
-					   (unsigned long long)diff.tv_sec,
-					   (unsigned long long)diff.tv_nsec);
-		} else {
-			numchars = sprintf(ts_buffer, "(%03llu.%06llu) ",
-					   (unsigned long long)diff.tv_sec,
-					   (unsigned long long)diff.tv_nsec / 1000);
-		}
+		numchars = sprintf(ts_buffer, "(%03llu.%09llu) ",
+				   (unsigned long long)diff.tv_sec,
+				   (unsigned long long)diff.tv_nsec);
 
 		if (timestamp == 'd')
 			*last_ts = *ts; /* update for delta calculation */
@@ -306,7 +288,6 @@ int main(int argc, char **argv)
 	unsigned char timestamp = 0;
 	unsigned char logtimestamp = 'a';
 	unsigned char hwtimestamp = 0;
-	unsigned char use_ns = 0;
 	unsigned char down_causes_exit = 1;
 	unsigned char dropmonitor = 0;
 	unsigned char extra_msg_info = 0;
@@ -358,7 +339,7 @@ int main(int argc, char **argv)
 
 	progname = basename(argv[0]);
 
-	while ((opt = getopt(argc, argv, "t:HNciaSs:lf:Ln:r:Dde8xT:h?")) != -1) {
+	while ((opt = getopt(argc, argv, "t:HciaSs:lf:Ln:r:Dde8xT:h?")) != -1) {
 		switch (opt) {
 		case 't':
 			timestamp = optarg[0];
@@ -378,10 +359,6 @@ int main(int argc, char **argv)
 			hwtimestamp = 1;
 			break;
 
-		case 'N':
-			use_ns = 1;
-			break;
-
 		case 'c':
 			color++;
 			break;
@@ -857,7 +834,7 @@ int main(int argc, char **argv)
 			/* build common log format output */
 			if ((log) || ((logfrmt) && (silent == SILENT_OFF))) {
 
-				alen = sprint_timestamp(afrbuf, logtimestamp, use_ns,
+				alen = sprint_timestamp(afrbuf, logtimestamp,
 							  &ts, &last_ts);
 
 				alen += sprintf(afrbuf + alen, "%*s ",
@@ -887,7 +864,7 @@ int main(int argc, char **argv)
 
 			/* print (colored) long CAN frame style to stdout */
 			alen = sprintf(afrbuf, " %s", (color > 2) ? col_on[idx % MAXCOL] : "");
-			alen += sprint_timestamp(afrbuf + alen, timestamp, use_ns, &ts, &last_ts);
+			alen += sprint_timestamp(afrbuf + alen, timestamp, &ts, &last_ts);
 			alen += sprintf(afrbuf + alen, " %s%*s",
 					  (color && (color < 3)) ? col_on[idx % MAXCOL] : "",
 					  max_devname_len, devname[idx]);