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

remove unnecessary line length caching functionality

pull/290/head
Memet Bilgin 2021-05-02 23:09:31 +10:00
parent b7e27b9749
commit 39ebc30e39
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
candump.c
View File

@ -317,7 +317,6 @@ int main(int argc, char **argv)
FILE *logfile = NULL; FILE *logfile = NULL;
int buffer_length = 0; /* number of entries to store in ring buffer */ int buffer_length = 0; /* number of entries to store in ring buffer */
int buffer_index = 0; int buffer_index = 0;
int line_length = 0; /* cached length of entries */
unsigned char circular = 0; unsigned char circular = 0;
@ -806,7 +805,7 @@ int main(int argc, char **argv)
} }
if (circular) { if (circular) {
char output[1024]; char output[CL_CFSZ + TIMESTAMPSZ];
char buf[CL_CFSZ]; /* max length */ char buf[CL_CFSZ]; /* max length */
char ts_buf[TIMESTAMPSZ]; char ts_buf[TIMESTAMPSZ];
@ -818,14 +817,10 @@ int main(int argc, char **argv)
8 characters for an extended can-id, 1 character for the hash 8 characters for an extended can-id, 1 character for the hash
and 16 character of payload (maximum allowable size) and 16 character of payload (maximum allowable size)
*/ */
int len = snprintf(output, 1024, "%s%*s %-25.25s%s\n", ts_buf, snprintf(output, CL_CFSZ + TIMESTAMPSZ, "%s%*s %-25.25s%s\n", ts_buf,
max_devname_len, devname[idx], buf, max_devname_len, devname[idx], buf,
extra_info); extra_info);
/* store the formatted size of the finished output string */
if(line_length == 0)
line_length = len;
/* if the buffer index has grown past the desired count, seek to head of file and reset counter */ /* if the buffer index has grown past the desired count, seek to head of file and reset counter */
if(++buffer_index >= buffer_length){ if(++buffer_index >= buffer_length){
rewind(logfile); rewind(logfile);