ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cut: code shrink

Browse source 
move "linenum" manipulations to the one place where it is used.

function                                             old     new   delta
cut_main                                            1373    1360     -13

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2024-12-21 00:43:45 +01:00
parent 1ea89fa98a
commit 14f57f5357
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
coreutils/cut.c
View file

@ -143,15 +143,15 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
} else if (!opt_REGEX && *delim == '\n') { } else if (!opt_REGEX && *delim == '\n') {
unsigned spos = cut_list[cl_pos].startpos; unsigned spos = cut_list[cl_pos].startpos;
linenum++;
/* get out if we have no more ranges to process or if the lines /* get out if we have no more ranges to process or if the lines
* are lower than what we're interested in */ * are lower than what we're interested in */
if ((linenum < spos) || END_OF_LIST(cut_list[cl_pos])) if (linenum <= spos || END_OF_LIST(cut_list[cl_pos]))
goto next_line; goto next_line;
/* if the line we're looking for is lower than the one we were /* if the line we're looking for is lower than the one we were
* passed, it means we displayed it already, so move on */ * passed, it means we displayed it already, so move on */
while (spos < linenum) { while (++spos < linenum) {
spos++;
/* go to the next list if we're at the end of this one */ /* go to the next list if we're at the end of this one */
if (spos > cut_list[cl_pos].endpos) { if (spos > cut_list[cl_pos].endpos) {
cl_pos++; cl_pos++;
@ -161,7 +161,7 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
spos = cut_list[cl_pos].startpos; spos = cut_list[cl_pos].startpos;
/* get out if the current line is lower than the one /* get out if the current line is lower than the one
* we just became interested in */ * we just became interested in */
if (linenum < spos) if (linenum <= spos)
goto next_line; goto next_line;
} }
} }
@ -280,7 +280,6 @@ static void cut_file(FILE *file, const char *delim, const char *odelim,
/* if we printed anything, finish with newline */ /* if we printed anything, finish with newline */
putchar('\n'); putchar('\n');
next_line: next_line:
linenum++;
free(line); free(line);
} /* while (got line) */ } /* while (got line) */
@ -399,7 +398,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
//if (nranges == 0) //if (nranges == 0)
// bb_simple_error_msg_and_die("missing list of positions"); // bb_simple_error_msg_and_die("missing list of positions");
//^^^ this is impossible since one of -bcfF is required, //^^^ this is impossible since one of -bcfF is required,
// they populate LIST with non-empty string and when it is parsed, // they populate LIST with non-NULL string and when it is parsed,
// cut_list[] gets at least one element. // cut_list[] gets at least one element.
/* now that the lists are parsed, we need to sort them to make life /* now that the lists are parsed, we need to sort them to make life